Which issue # if any, does this resolve?

Please check one:
- [ ] New tests created for this change
- [ ] Tests updated for this change