Revert "Merge branch 'hotfixes' into 'pregmod-master'"

Pregmodderrequested to merge
revert-339c2b54 into pregmod-master

This reverts merge request !4018 (merged)

Merge request reports