Merge branch 'jk/prio-queue-avoid-swap-with-self'