Backport of version 1.1.0.0

Device widths consolidated