Scope-2258

Scope-2258