Add  feature
Merge corrected affiliation timeout