MP1-4554: API changes