Merge branch 'master' into dev
Deleted files from last merge