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

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.