API and merge

Change-Id: I4a2e95104f6a2514ba83fecb8407c4750d3fa609