Pull features

Updated all features to latest 2.x branch.