#390 fix for Mask shifts in date field when editing field after text highlighted
fix merge conflicts