Taken a copy of latest code from 2.1.2-wso2v4