Updated to latest from TCS
Corrected merge conflict on bean names.