Fixed for multiple things:

* master revert
* translate issues
* product watch refactor

@hippee-lee