Merge board updates from trunk.