Merge branch 2.56.1 into master (zero-line merge)