merge with branch cm9