Core pr 3

* Exported to features version 2.x