QAART-165 code review changes per Bognix request