prep for 3.6 development cycle