[MASS-014] MASS-014