Merge branch 'development/fix-canonization' into 'next'

Fix canonization of the alphatree and watershed hierarchy

See merge request !124
13 jobs for next in 28 minutes and 54 seconds (queued for 10 seconds)