Roll object-storage version 0.12.25
Merge branch 'release/0.12.25' into develop