OSIS-5571 Merge branch 'feature/OSIS-1428' of github.com:uclouvain/osis into OSIS-5571
OSIS-5571 Merge branch 'feature/OSIS-1428' of github.com:uclouvain/osis into OSIS-5571

uclouvain/osis,uclouvain/osis,uclouvain/OSIS-Louvain,uclouvain/osis,uclouvain/OSIS-Louvain,uclouvain/osis,uclouvain/OSIS-Louvain