Merge changes I88865c02,I34cc1310 into lmp-preview-dev

* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE