MP1-4523 : rework