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

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