Merge tag 'v3.0.41' into cm-11.0