Merge tag 'v3.4.84' into cm-11.0

This is the 3.4.84 stable release