https://bugs.internet2.edu/jira/browse/SIDP-265