#11893 bug fixes