When the cursor is moved up/down, it now stays in the same column
Merge branch 'master' into 31_EAP