Init-Hack.
Merge TFS Changeset 35