Merge branch 'prepare-for-2.00'