Merged in appropriate changes from HPCC branch.