Changed target-action methods to delegates to get rid of last 2 static analysis warnings
Merge remote-tracking branch 'origin/UnitTesting'