Sync branch with Backend-team

[iamvibhorsingh]

Title

Syncing

Description

If this fixes a bug or resolves an issue, provide a link to that issue. Give a detailed description that answers:

• what is the purpose of this PR?
• what is the original vs the new behaviour?
• what bug does this PR attempt to fix?
• what is documented in the new documentation?

Types of Changes

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

Checklist

• [ ] 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

[iamvibhorsingh]

There is some error while merging backend-team and master (current branch is up-to-date with master). Will make necessary changes locally and then create a new PR.