TIMOB-16492-New PR with latest master-took care of review comments
Merge pull request #5493 from salachi/TIMOB-16492-New

TIMOB-16492-New PR with latest master-took care of review comments