Merge remote branch 'origin/bug_288_remove_no_resume_on_minor_start_cutpoints'