Move Feature abstract into base folder
Merge branch 'develop'