Preliminary M1000 support