Merge commit 'd2d630b1b5c20a9e3d223595566def35c1175ca9' * commit 'd2d630b1b5c20a9e3d223595566def35c1175ca9': fix text area insertion order, partially