[TIMOB-17004] Fixed release builds
Merge pull request #236 from pec1985/timob-17004-3_3_x

[TIMOB-17004] back port Fixed release builds