Merge branch 'bug_246_cutlistedit' into experimental