SHRINKRES-162 SHRINKRES-182 Fixed internal handling of packaging and types