Merge branch 'merge-upstream' into 'dev'

update with recent Galaxy from upstream

See merge request !58