updates from wso2-dev fork