Merge the minor improvements of wip to master

and then start a new stage