Zhimingd master patch 31743

Zhiming Deng requested to merge linggeg1/swen90006-a2-2020:zhimingd-master-patch-31743 into master Oct 22, 2020