merge Jb mr1 device changes