merged some cm changes