ENG-4410 add the bits and pieces missing from the last commit