[#46818783] Applying PR comments