changes for inclusion in Confluence