I hope these photos are diagnostic. They are of my 3 yo plant that has only just started to grow well this year. I obtained it from John Nieuwesteeg who states he got the budwood from Ruston's. All photos taken Feb or March 2021 at Mount Macedon, Australia.

I just wanted to add that the two photos of prickles are actually of the same shoot; the winged near the base and the hooked ones at about 1 m.