ChangeLog #8564 under investigation