Closes 3245 Closes 3561 These issues were originally linked in issue 3672 and as was mentioned in PR 3706, it's unclear which commit resolved the issue but the issue can no longer be reproduced.
