Merge branch 'fixing-datepicker-again'
Merge branch 'master' into fixing-datepicker-again
check the update datepicker later