Merge "Add system reclass for gnocchi"