[Brief](https://docs.google.com/document/d/1GvmHQxjwCOS6xEZqWTCf5UoQB3DzdSMKIKfJZLiG3X0/edit?usp=sharing) Tasks - [x] #610 - [x] #893 - [x] #996