Committing Features module in backend
Merged changes update to PM-34