merging RT_3_6_4 to HEAD