More appropriate description of device name header
Merge branch 'release-2.4.0'