TEZ-1742 addendum patch for follow up comments