Merged trunk revision 223002 into the hsa branch.