Master to release-stg

div dev doe requested to merge master into release-0.6-stg Nov 16, 2020