Enables seamless transition to/from subpath based access
Co-authored-by: Balu Babu <balub997@gmail.com>