Merge branch 'dev' into 143-update-galaxy-to-25-1