Support Core devel

Core devel