Closes [gh-493]