Merge branch '3.0.31' into cm-11.0