Merge change 9021 into donut

* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException