Merge branch '2509_diff_quick_move'