Integrate
Sync with amber-common