HR-316 Extend "Evaluation" activity type
HR-316 Code comment and cleanup