Merge branch '519993_compositebuild' into dev