Unfortunately #5261 PR does not pass unit tests and the PR author has not responded so the backport job still needs doing.