Merge "Adding meta-data for test app" into main