Merge branch 'upstream' into 115-update-galaxy-to-latest-24-1