Backported change done by Rudi directly in IBS