syncing 72X with 71X
Merge pull request #5780 from yiiyama/ecaldqm-online-config-72X

syncing 72X with 71X