Merge Develop in Master

Develop branch will be discarded after this PR is merged.