Supports CORE-374