Merge change 7146

* changes:
  Fix CNAP-related NullPointerException