Merge branch 'fangyaling-3.6.x' into 3.6.x #186

Job	Run time
Build on ubuntu:16.04 - gcc	8m 2s
Build on ubuntu:16.04 - clang	10m 9s
Build on ubuntu:20.04 - gcc	12m 1s
Build on ubuntu:20.04 - clang	10m 17s
Build on ubuntu:22.04 - gcc	12m 7s
Build on ubuntu:22.04 - clang	11m 52s
Build on debian:stable - gcc	10m 8s
Build on debian:stable - clang	12m 2s
Build on debian:sid - gcc	10m 33s
Build on debian:sid - clang	10m 31s
Build on quay.io/centos/centos:7 - gcc	8m 28s
Build on quay.io/centos/centos:7 - clang	9m 39s
Build on quay.io/centos/centos:stream8 - gcc	10m 2s
Build on quay.io/centos/centos:stream8 - clang	13m 16s
Build on quay.io/centos/centos:stream9 - gcc	11m 30s
Build on quay.io/centos/centos:stream9 - clang	10m 51s
Build on fedora:latest - gcc	10m 37s
Build on fedora:latest - clang	10m 42s
	3h 12m 47s

Provide feedback