Merge branch 'ws/fast-export-with-revision-options'