The Road to 3.6 Beta 1

#3-6