967 Commits (nc-fix/date-picker)