am cd4b38ea: Merge "Resource resolution bug fix." into lmp-preview-dev

* commit 'cd4b38ea1d3605e0e62e5ddc70c052e221fef73c':
  Resource resolution bug fix.