Merge "misc: Merge branch v20.1.0.3 hotfix into develop" into develop