[#77614326] pr comments addressed