Enable compatibility with all M8 variants