Skip to content

cherry-pick parts from 9.4 code-base, but remove the update path

Closes #3212351

Merge request reports