Palash Singh Raghuwanshi

I have squashed the previous commit for easier merge.

I have separated the changes into 3 different commits @timabbott to best of my understanding, thanks for the advice! Ready for review.

Thanks for working on this @srdeotarse! I have a review regarding the commits. Your commit messages don't comply with the [commit discipline](https://zulip.readthedocs.io/en/latest/contributing/version-control.html#commit-discipline) guide. Also you might want to clean up...

> @raghupalash I have cleaned my commit history and changed commit messages according to commit guidelines. I think you'd want to squash all the commits in one single commit (as...