timob-9448: Backport to 3_0_X

Backport of PR #82