The JIRA for this is TS-1969.

Proposed Solution