Release/1.1.0

Merge the last minute changes of the release into develop