minor fixes
Merge branch 'affinity' into affinity-prod-supp