#10596 bug fixes