merging RT 4.0.6