Merge "Move helper methods for object_storage to base.py"