Merge "Added CloseGuard for BaseObj" into nyc-dev