ITS#6607 to be fixed in 2.4.24?