AS7-6139, ModelTypeValidator is overly lenient about numeric types.

AS7-6139, ModelTypeValidator is overly lenient about numeric types. Fix issue for Master