Hackfest support

Change-Id: Icaa494b608199fb4869ce618ddb7eb1b00221961