merge to cf-release release candidate