Update dev-0.8 to master-0.8