Sync with master - Githubissues

Title

Sync with master

Update from master branch

Put an x in the boxes that apply

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