TIMOB-12558 Fix arc-incompatible code made afterwards.
Merge pull request #4087 from BlainHamon/timob-12558_3_1_X

TIMOB-12558 Fix arc-incompatible code made afterwards.