Merge branch 'jb-devel-mr2-release' into kk-devel

Conflicts:
	default.xml