backport another 3.2 fix
[#724 state:resolved] fixed issue with datepicker, backport 3.2 fix