CAAERS-6362 Error while re-evaluating AEs - Fixed tests
Merge remote-tracking branch 'origin/master'