QAART-447 fix from CR