Merge branch 'fix_gc_bug_in_test' into 'ibm-trunk'

Fix gc bug in test.

See merge request !62