For ENG-5579, add a comment based on feedback from Ning