issue #20458: Refinements to models