Merge "Be less aggressive when inlining." into oc-dev