A whole stack of 0.21 changes!