Commit from dev
Conflicts resolved