Merge branch 'deps-updates-2' into trunk