Message pileup fix and code cleanup.
Merge remote-tracking branch 'origin/master'