generator priorities
Merge branch 'master' into victor/ui_improvements