Merge "Speed up structure update before OnFillRequest" into oc-dev