CDITCK-371 Fix ArchiveBuilder ShrinkWrap optimization
CDITCK-371 Minor improvements