Merge dev to master with fixes