COMMANDBOX-86 #resolve
Updated to work with package directory