[DF-185] Fix ScopedPtr