Merge branch 'develop' into lbudginas/replace-date-time-pickers-shadcn-ui