Merge branch 'develop' into lbudginas/#576_date_picker_issue