Merge tag 'v3.4.85' into cm-11.0

This is the 3.4.85 stable release