Description

Just update "implement-live-capture" branch to be compatible with master

Type of change

Put an X in the relevant boxes

[ ] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
[ ] This change requires a documentation update

Please generally describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.

Test Configuration:

[ ] My code follows the style guidelines of this project
[ ] I have performed a self-review of my own code
[ ] I have adequately commented my code, particularly in hard-to-understand areas
[ ] I have made corresponding changes to the documentation
[ ] My changes generate no new warnings (if there are any, note them and why they could not have been removed)
[ ] I have added tests that prove my fix is effective or that my feature works
[ ] New and existing unit tests pass locally with my changes
[ ] Any dependent changes have been merged and published in downstream modules