Summary: Backport of this [[ https://phorge.dev.yugabyte.com/D50807 | diff ]]

Test Plan: tested manually

Reviewers: lsangappa

Reviewed By: lsangappa

Subscribers: yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D54455