synced with hermes (space load and save bson fixed)