Merge "Check if we require barrier if we did not resolve classes" into nyc-dev