Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781) Slightly speedup density test