Limiting WrapperIdMap to package-visibility.
Merge branch 'development'