1.62 adds bundle support.