a separate JIRA (to be handled post-M2) makes sense in this case