Merge branch 'rs/init-no-duplicate-real-path'