Update with latest cf-release

Change-Id: I7bba19ab09cbab8ecbbe7d523a9520d62c09c0da