Branch dev_NOC_2012_r3555. #1006. Step 13: Merge in trunk changes between revision 3452 and 3555. NOC merge complete subject to final SETTE testing.