Merge tag 'v3.4.63' into cm-10.2

This is the 3.4.63 stable release