WIP: Upgrade to Features 2.x

#2857