Merge branch 'rs/more-uses-of-skip-prefix'