Merge branch '4AI1.7' into cm-10.1