Merge branch '587-cxroot-module-not-working-anymore-after-update-to-latest-master' into 'master'

Resolve "cxroot module not working anymore after update to latest master"

Closes #587

See merge request !499