Merge branch '2111_pause_copy'