MBS-799/MBS-5919: missing '1' in 'entity1'