Port 0.6 changes to 1.0.0

/cc @diunko @scf2k