Merge with 2.065-beta