Merge "Fix the default value of stage_dir"