#17477 Fix problems, add comments, improve formatting
#19747 More tweaks
#19747 More fixes
#19747 Remove error log
#19747 Resolve merge conflicts
#19747 Resolve issues
#19747 Resolve further issues
Merge pull request #172 from ncatanchin/19747

Code Review for Job #19747