Ah, AFAICS, that's already done in in PR #305. Maybe you could link the PR from all JIRA issues which it addresses?