Merge branch 'enh/dyn_based_align' into 'master'

Enh: dyn based align

See merge request !38
3 jobs for master in 16 minutes and 54 seconds (queued for 7 seconds)