Adapted to changes in Alignment project

Sebastien Poncerequested to merge
sponce_adaptAgain into master

Based on top of !45 (merged), Depends on Alignment!159 (merged)

Edited by Sebastien Ponce

Merge request reports