merging https://wso2.org/jira/browse/ESBJAVA-3221