Shipping and cc into endpoints dev branch