Bug Fix #8626