QAART-179 fixes after kkarolk CR