lu-branch: use ff_combined_packet

Hey Luca

Can you just cherry-pick my commits? I've synced my repo with upstream and there are more changes than expected..

Thanks!