s1734 Merged ac2 into this branch and fixed merge conflicts.