Fix critical production bug.
approved this merge request
started a merge train
merged
mentioned in commit a2ad79a4