Merged r7769:7873 from michaelld/bc_behavior into trunk.