12 Commits (maliming/datepicker-cleanup)