addresses #9931, #9650