Cleaned up for final report.
Merge-commit.