Merge tag 'backport/v3.14.24-ltsi-rc1/sh-sci-to-v3.18-rc1' into backport/v3.14.24...