Rebase on master, cleanup for merge