Merge branch 'prio-hints'