Merge dev to master with mobile branch