Chores cherry pick #837 to release-1.2 (#839) #839 (ashnamehrotra) Prepare v1.2.1 release (#841) #841 (github-actions[bot])