Merge remote-tracking branch 'origin/master' into doc/15999-integrate-usb-image-in-the-release-process