Cherrypick parts of hackweek backpack branch while keeping compatibility with parachute implementation