IDE-901: Updated after Greg's review comments for pull#624