Merge preparation for release and next development version