Merge "More work on issue #73301635: Ability to extract device configuration"