Fixed bug #16526: EM resolve dependencies by moving common objects to API class