Final changes before overhaul
Merge 0.21