[OE-4492] Better dynamic package creation