Let's only add one instance of a context item
Update version/changelog