Branch 8 12 2022 firebase

[shetyeanuja]

Thank you for donating your precious time to this project

Before making a pull request, please make sure:

• [ ] The code builds clean and without wanings
• [ ] The code has been tested
• [ ] The appropriate terminology is used
• [ ] The necessary test units have been added