Merge branch 'release' into testserver-stable