ENG-6857: review changes.