3.6/news merge with 3.6 dev