TAKH-4394

TAKH-4394