add cherry-picks (for a107)