Changes from the wso2-dev repo