Caret may be undefined if input isnt visible
Merge branch '1.x' into 2.x