merge new 2.7.1 and 2.8 features into one