The spirit is here (2/2)

Change-Id: I2585f4282c3c72de13e6c2fe76bd3080897a37af