Added registry of top-level descriptors
Addressed comments
Fixed duplicate call to add to profile registry
Merge from cherry-pick branch
Addressed a whitespace comment