AffinityNG alpha (internal rev929)