z4u-3.4.0-g996394e
revert to use real device codes
prepere to merge
Merge commit '0d86a13d2311d203fab738a3e93ac8349eac0585' into msm_restore