[#46824777] Applying PR comments