Adding https://wso2.org/jira/browse/TA-812