Merge change 23169 into eclair

* changes:
  More assert => CHECK