DELTASPIKE-593 improved handling of internal packages