This issue is not a high user pain or regression. We will not backport the issue resolution to 2021. If you feel like this is a blocking issue for you project, please be welcome to add additional information so we can re-triage the issue and re-evaluate it's priority for a backport.