#1745761, #755670, #13357, #12629, #1200313: merge with 3.2.