Merge branch 'genete_setup_dialog'