Merge "Update cp table after create resource"