QAART-271 cr fixes per @justnpT @bognix @themech @kvas-damian