merged object map fixes from egypt