Sync with master - Githubissues

Title

Sync with master

Sync changes from master branch to backend team branch.

Put an x in the boxes that apply

[ ] Feature (non-breaking change which adds functionality)
[ ] Bug Fix (non-breaking change that fixes an issue)
[ ] Breaking Change (feature/fix that causes existing features to not work as expected)
[ ] Documentation

[ ] I have read the [contribute]contributing doc
[ ] Classes, scripts, and environment variables follow existing naming convention
[ ] Lint and Unit tests pass locally
[ ] New features on hardware have been tested on a local Raspberry Pi
[ ] Mention new programs/binaries if any must be installed along with this change
[ ] Mention new environment variables if any have been added to hardware/env file
[ ] Test coverage should not drop more than 3%
[ ] Any new required python modules are added to the requirements.txt