missing re-assign dob check logic, fixes #7700
Merge branch 'dev' into test
Merge branch 'test' into prod