Pull request CM-10.1