Various improvements and ENG-5269