Merge remote branch 'origin/bug_429_remove_hardcoded_paths' into bug_429_remove_hardc...