Merge "Unstable test_container_synchronization"