Maintain context through includes
Update CHANGELOG.