Merge tag 'v3.0.86' into cm-10.1

This is the 3.0.86 stable release