[[ Bug 12726 ]] Bug ported to 7.0