Merge branch 'bug_429_remove_hardcoded_paths' into experimental