Update smb349 from m7wlj CM source