Update to current 0.8-pre