Update with amber-common