0.4 and 0.5

Bringing upstream up to data.