merge pull req from cm 11.0