Merge with 2.065 pre-release development