Merge branch '2123_crash_while_copy'