I created an patch for this as per inputs shared above.
Can team please review and share feedback if any as this being my first patch for community.

Thanks
Ashish.