moving the cursor up/down in a column did not work in some cases
Merge branch 'master' into 31_EAP