Added multiple storages support
Merge branch 'multiple_san' into develop