Merge remote-tracking branch 'origin/master-audit-v0.0-1203-g901b8d2_magic-8.3.74_2020-10-28_020902_0000'