WIP: m7: consolidate all m7 variants