misc: Merge hotfix v20.0.0.2 into develop