HANA-21689

HANA-21689