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

TIMOB-12558 Fix arc-incompatible code made afterwards.