Merge "Follow-up to Ib027e1f98ec3d8ac9a5d2d5c01c4db08eebda3ee" into mosk-25.1/caracal