TODO:
Rebase commits 38e7b166a2 and 24308df719.

Acceptance criteria:
Commits should be squashed manually and commited with the original commit message, so PR should be labeled with tide/merge-method-rebase.