issue #21986: model augmentation