Updated to match master
Ported CamelPackRefillHandler