Source v3 => v4.
Don't cache when exporting.
Merge branch 'master' into carmen