fixed some federation parameters
updated version
Merge branch 'qa'