(PE-4617) Adressed PR comments