Delegate fixing.
Merge remote-tracking branch 'origin/UI' into Client