#12203 bug fixes