Efforts to add this functionality to upstream have started and can be tracked here - https://review.opendev.org/#/q/topic:%22bz:1747445%22+(status:open+OR+status:merged)
Due to the proximity of the OSP14 being EOL we will not be bringing this change downstream. If there is a business justification for this backport please reopen the issue.