Merging IBM int. test and some code fix

1 job for !24 with ibm-int-test in 16 minutes and 18 seconds (queued for 3 seconds)
merge request