Maybe we shouldn't  patch COD in this Pull Request?