STONE-1563

STONE-1563