common: merge from a8