Merge change I869898f1

* changes:
  Fix an assertion.