[NHDTC-18006]

[NHDTC-18006]