Make the base_dir an absolute path.
Merge branch 'absolute_base_dir'