TRUNK-4126 addressed the previously added comments after the previous commit