Merge tag 'backport/v3.18/sh-msiof-to-v3.19-rc7' into backport/v3.18.6/snapshot.wip