Merge "Removed deprecated onFillRequest() method" into oc-dev