Enrico credits

Change-Id: I1e7028d776265bb29a94bb623c4550b425d483ef