[Timob-16538] (3_2_x)

Please ask customer to test this.