Merge branch 'master' into 'master'

Correction to prealignment displacements in x and y.

See merge request !6
5 jobs for master in 1 minute and 13 seconds