Fix primitive/complex collection handling on subtypes (10.0) (#37488)

Fix primitive/complex collection handling on subtypes (10.0) (#37488) #597