sync CHANGES from 9.11.6-P1

42 jobs for !1917 with each-sync-v9_11 in 23 seconds (queued for 3 seconds)
merge request