am 2383f220: Merge "Validate objects are from the correct context."

* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.