Merge "Close cursor after getting data from DB" into oc-mr1-dev