Branch merge: packaging fixes