am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6 automerge: 862cdd6
automerge: 6a43990

* commit '6a439908fcc103696dd90bc42494231b54b7a10b':
  Resource resolution fixes.