Issue #, if available: Description of changes: By submitting this pull request I confirm that my contribution is made under the terms of the Apache 2.0 license. I confirm that I've made a best effort attempt to update all relevant documentation.