SNWDRFT-1861

SNWDRFT-1861