https://github.com/jekyll/jekyll/pull/9504
https://github.com/jekyll/jekyll/pull/9482
