Merge of master into devel reverted some USB image doc work
Originally created by @intrigeri on #16376 (Redmine)
Feature Branch: bugfix/16376-fix-buggy-merge
Originally created by @intrigeri on #16376 (Redmine)
Feature Branch: bugfix/16376-fix-buggy-merge