Merge in 58534, 58627, and 58628 from trunk. After this, the 0.3.15 code is frozen.