Timob 11652 3 0 x

Backport of #3421