Merge "Use a separate heap size to receive buffer" into oc-dev