Prelim Gnocchi support

Change-Id: I771935afd3511547209ab0dab215725348b6cb27