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