Eng 4141

All these commits are mistakenly attributed to ENG-4141, These are actually for ENG-4144 and to a certain extent ENG-2353.