cheryy pick config update & rebuild