This has a PR, but we are waiting for the dependent bug to verified before we can link it, will likely be linked next sprint
This is ready to merge, just waiting for the patch manager to approve and merge into the next release. Nothing more we can do this sprint.