Merge remote-tracking branch 'remotes/origin/main' into 827-jbm-crend-early-reflections-are-wrong