We should backport the fix for 1453653 for Orfox. I guess we could just use the ESR52 patch in that ticket.