QAART-164 cr fixes per Bogna and Michal