Fix/prepare release

Cyril's review of "topic/prepareRelease".