Issues resolved: #944 and #1006