fix bad merge
Merge pull request #3665 from euforic/timob-11794_3_0_X

fix bad merge for [#TIMOB-11794] 3.0.x