issue #20073 and #19813: Bug fixes.

...roup model problems.