TIMOB-12930 The dangers of copy-pasting at the last moment. 9995dc3 had two, two, two regressions for the price of one!
Merge pull request #4026 from BlainHamon/timob-12930

TIMOB-12930 The dangers of copy-pasting at the last moment.