Merging r259342 (with s/p2align 4/align 16) because r258750 is not in 3.8.