Fix usage of parent class properties in ComponentAsId (NH-3105)
Merge branch '3.3.x'
Remove code duplication in unwrapping nullable types