Temporarily commit fix to issue #8108, to check for buildbot response
2 files changed