m7-common: changes for evervolv