Pull changes from dev-0.8