fix for metadata directive
add an evaluation-indicator directive
Merge remote-tracking branch 'refs/remotes/origin/master'