Merging PrimaryHost feature branch into trunk.
trunk v1.4.0.2 revised project information stweep entire project
v1.4.0.1 trunked