Fix merge of fix for bug #7716.