Merge remote-tracking branch 'upstream/main' into jpw-component_densities