Merge branch 'ibm-impl-int-fix-merge' into 'master'

Ibm impl int fix merge

See merge request !19
2 jobs for master in 6 minutes and 49 seconds (queued for 3 seconds)