Backported change done by Rudi directly in IBS
Merge pull request #4 from kobliha/Code-11-SP3

Backported change done by Rudi directly in IBS