Merge pull request #18796 from sahil28297/merge_v12_hotfix_1

Merge version-12-hotfix into develop