updates from wso2-dev repo