I think that's probably worth a separate JIRA if there's not already one for that.