#1755 Cherry pick #1732 to release v1.2 branch Pull request opened by pradithya TL;DR Cherry pick #1732 to release v1.2 branch Type ☑︎ Bug Fix ☐ Feature ☐ Plugin Are all requirements met? ☑︎ Code completed ☑︎ Smoke tested ☑︎ Unit tests added ☑︎ Code documentation added ☐ Any pending items have an associated Issue Complete description See #1732 Tracking Issue flyteorg/flyte#3559 Follow-up issue NA flyteorg/flytekit ✅ All checks have passed 30/30 successful checks