I wonder if they will have this resolved by the upcoming SHM. I know it was mentioned in the PR, but they didn't state when it will be complete.