Adjusted to my fork and to build release-candidate