Merge "Update from 7.55.1 to 7.57.0"