Add --separate option
Merge remote-tracking branch 'origin/master' into regioncache