Merge branch 'revert-0095f899' into 'master'

Revert "Merge branch '21pesi1bif-master-patch-94087' into 'master'"

See merge request !24
2 jobs for master in 7 seconds (queued for 3 seconds)