Device-specific : Added compatibility to the latest core version