[[ Bug 13026 ]] Bugfix brought to 7.0