#11837 bug fixes