Merge "Add back the stat log for B*"