ZEST / filestore.disk / External: merge

merge