Merge branch 'master' into genete_setup_dialog