Merge some more parts of 2.065 pre-release development