SPOT-1421

Implemented w/ tests