Trying to release

Adresses #1016. All should be resolved
Adresses #1011