Merge remote-tracking branch 'origin/main' into 481-unused-variables-within-hr_metadata