Features and fixes for the second branch.
This milestone contains everything that is needed to be done or that we want to do before the next release.