Merge "Sync test-application" into devel/master