#WEB-11677 fixed
notnull
notnull, cleanup