Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev