Backport to 3.1.x [TIMOB-14129]