QAART-239 fixes after kkarolk cr