DE388 - replace error label with the correct label at that point in time and ensured the date value was populated
Merge branch 'development' into development-work