Merge remote-tracking branch 'origin/3.x' into 3.next #689

Job	Run time
cs-stan / Coding Standard & Static Analysis	30s
testsuite / testsuite-linux (8.2, highest, false)	35s
testsuite / testsuite-linux (8.1, highest, false)	38s
testsuite / testsuite-linux (8.3, highest, false)	34s
testsuite / testsuite-linux (8.1, lowest, false)	30s
testsuite / testsuite-linux (8.4, highest, false)	1m 22s
	4m 9s

Provide feedback