Merge branch 'jc/github-actions-update'