AffinityNG alpha (internal rev656)