Pre-merge commit.
Merging changes with local.
Fixed an issue with binary file content showing up in the output file.