r12040: merging packaging fixes from release branch