ENG-5153, ENG-5176, ENG-5198, ENG-5204: changes based on Paul's review.