Merge "Fix text written below cursor bug" into devel/master