using own msm-7x30-common repo