BroadcastBrick + Refactoring
Merge TFS Changeset 266