Merge remote-tracking branch 'origin/f-yodii-commands' into f-yodii-commands
Fixed bug in Static resolution (taking Family.RunningService into account).