Merge remote-tracking branch 'remotes/origin/main' into revision_of_constants