QAART-239 fixes after cr