Bring edge up to date with 0.6 pull requests