Fix trial builds
Merge branch '3.0.0' into beta