Merge branch 'eighthave-prerelease' into prerelease