Cleanup and changelog entry for new contextfunction behavior
2 files changed