misc: Merge branch hotfix v20.1.0.2 branch into develop