Merging issue #1915 - Performance fix for Datepicker