release/21.1.17

Nicolas Berger

@nberger

26bcb305 · Merge branch 'atr-17043-fix' into '21.1' · Oct 10, 2017

Release to be deployed at P1 next week, reverts Bjet hypo changes that were causing problems