The bug is fixed.
Merge branch 'hotfix/prod-critical-bug'