Created https://jira.doit.wisc.edu/jira/browse/WCP-341