bugfixes STORAGE-1670 STORAGE-1669