And more devices
Merge remote branch 'cm/master'