Merge "Fix CTS Test Failures." into main