am 4c5309fb: Merge changes I88865c02,I34cc1310 into lmp-preview-dev

* commit '4c5309fb3b0abfc86fdfad9844ce20e2df03497b':
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE