Merge "Added CloseGuard for BaseObj"