Updated in develop
Conflicts fixed