Any chance you could get a backport of these two PRs merged before the final patch?
They were originally done for foxy so a backport should be possible with little effort. If you want I can also create the PRs.