Custom scope
Merge remote-tracking branch 'origin/development' into multiuser
Adding missing comments part to new classes for scope
Removing unused dependencies