Simplify extract implementation
Merge branch 'master' into cr-fixExtractDialog