Related to issue #996, #997, and bug:9996