Done 4.1 : 4.5

Checked 4.1 and 4.2 with Jamal