Merge branch 'cp/unit-test-prio-queue'