TS-1461

JIRA Ticket: https://issues.apache.org/jira/browse/TS-1461