Feature/entites merge

Merge latest changes from master into feature/entities