Merge branch 'dk/skip-prefix-scan-only-once'