Merge "Introduce early exit path for non resource path." into oc-dev