Apologies for lack of individual commits and loss of history. These updates were performed on a private project and commit history contained sensitive data. So had to go with single monster commit.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.