HYPER-12159

HYPER-12159