Merge "Merge QQ3A.200605.002 into master"

mentioned in commit 526dbaec

mentioned in commit cc730ec4

mentioned in commit 38c4d169

mentioned in commit 76f69d48

mentioned in commit 7f6fdbfb

mentioned in commit f281611d

mentioned in commit d809d25a

mentioned in commit 7c7ff8f4

mentioned in commit 4b2de9d8

mentioned in commit 855609c1