[[ Bug 14046 ]] Apply the bugfix 11485 (was not ported to 7.0)