Committing the fix for https://wso2.org/jira/browse/CEP-734 and https://wso2.org/jira/browse/CEP-695