Merge branch 'jk/stable-prio-queue'