Merge pull request #4418 from kumpera/fix_gclass_recording_on_failure