refactor fetch/merge/sandboxing; implement safe-only
fix problems with previous commit
Merge branch 't25' into develop

* t25:
  fix problems with previous commit
  refactor fetch/merge/sandboxing; implement safe-only