squashed 'v3.4.62' into jb-mr2 'v3.4.0'