Jb mr1 merge updates