Merge branch '2261_multiedit'