Closes 1009709