Syncing branches

[troy-ameigh]

Issue #, if available:

*Description of changes: sync branches

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.