Merge fdb-storage

Straight merge and no conflicts, as it was already synced with master.