[merge] CM mind heal changes