KWAN-31832

KWAN-31832