am c8fe2925: GAP: Retain the old COD if already present

* commit 'c8fe2925af4f5b167b615a0677adebbd156a4387':
  GAP: Retain the old COD if already present