Good work, needless to say, I am eagerly waiting this fix to be backported to 2021.2
Link the issue for tracking: