Merge "Disable MASS by default" into devel/master