Marking this bug report as duplicate, so we can directly backport the change down to stable/victoria.
Marking this bug report as duplicate, so we can directly backport the change down to stable/victoria.