m7: move to m7-common