Partial merge of 20131121 update.
Merge more changes from 20131121 update.
Fix secondary scoreboards for 20131121 update.