Sync with amber-common