Merge tag 'v3.4.83' into cm-11.0

This is the 3.4.83 stable release