Updated features to 2.x
Merge remote-tracking branch 'origin/master' into development