bug#9276

Final version