[BUG #8137] Added model based implementation