backported things from qtwizvis branch (backported from configurator)
Merge branch 'master' into qtwizvis