commit fix for TESB-9055 on master branch