merge branch cm-12.0 upstream into cm-12.0 local