added expired for evaluations;
Merge remote-tracking branch 'origin/master'