Merge down my changes from release-4 (around evaluation messages)