Fixed the CPR check with a date check
Merge branch 'development'