Merging dev
Fix merge conflicts