= all: upgrade to be compatible with the latest code in core