Do not change element object during extract
Fix whitespace
Merge branch 'master' into 2574
Add unit tests for Collection element extract
Fix CS
Merge branch 'hotfix/3081'

Close #3081
Fix #2574