Added Short as predefined type #SCL-7380 Fixed