Merge "Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD"