Fixed severe production problem

We should pull request to `master` and base branches, and we did the hf. of the work.