https://issues.unige.ch/browse/AOU-237
https://issues.unige.ch/browse/AOU-239
WON'T => https://issues.unige.ch/browse/AOU-257