Added cf-175 and cf-riak-cs-4