**Describe the bug** This is a reopening of bug #488 which has a down-stream submission of PR #832. **To Reproduce** Steps to reproduce the behavior: 1. see bug #488 2. see PR #832