Merge dev into master

Request for merge dev into master