Merge branch 'upstream' into 111-update-galaxy-24-1