EXPRESS-2237: removed not nillable from some type properties
Fixed types after wrong merge
Merge tag '0.1.5'