(PE-4372) Addressed PR comments