Merge pull request #15619 from seamuslee001/fix_force_case_form_date