https://jira.toolserver.org/browse/TS-1598