[QAART-95]  Last commits, task done