Merge the pull requests by hand
Merge branch 'dev' into test