Do you have any additional information with respect to the motivation behind these changes? The commit message is rather short... ("fixed FF clustering")