SVY-7190 part support (made safer agains nulls)