Merge branch 'bug_615_replace_rawfile' into experimental