Backport for TESB-10321