Edits from CRE-4105
Edits from CRE-4105