Merge branch 'rs/inline-compat-path-macros' into jch