t714 added a logic to decide for update and insrt baswd on measureId>-1 also
Merge branch 't714' into resolved