Merge branch 'doc/16199-usb-images-beta'