SI-4695 Fix separate compilation of package objects