Merge "ClientComposition test fix"