Merge branch 'rs/patch-id-use-skip-prefix'