Added all goodies from Alvaro.

Change-Id: I952447f2a16b175502a9f969c71221d4f5a4dfdb