QMW-288 fix
fix merge changes