Merge branch '2522_smart_backspace'