Bug44168

Leeaving that for cataphract