Merge some 2.1 features and fixs