QAART-264 changes per @ukaka and justnpT