Merge remote-tracking branch 'upstream/master' into fix_str_encode_in… #11342

Job	Run time
omnibus compilations, trigger	2s
omnibus compilations, #1	28m 29s
omnibus compilations, #2	34m 13s
omnibus compilations, #4	26m 0s
omnibus compilations, #5	3m 14s
omnibus compilations, #8	28m 10s
omnibus compilations, #7	35m 4s
omnibus compilations, #10	26m 48s
omnibus compilations, #3	33m 20s
omnibus compilations, #9	27m 25s
omnibus compilations, #11	27m 54s
omnibus compilations, #6	27m 15s
omnibus compilations, #12	23m 34s
omnibus compilations, result	10s
	5h 21m 38s

Provide feedback