so maybe just a post-M6 JIRA for that (and in that JIRA mention that these are already in place)?