commented out the FDR statement
Merge branch 'master' into release/1.1