Merging issue #1915 - Datepicker performance