AffinityNG alpha (internal rev1466)