BZ956/BZ957 Add fix for built-in interceptors and local calls