Issue #8055 closed