Merge branch 'jb-mr1' into jb-mr1.1

Conflicts:
	default.xml

Change-Id: I0c7ef84b918cd2f5037fae94c3748a4b5f2de401