[JBIDE-15597] transition towards a single model