STINGRAY-12909

STINGRAY-12909