am 1d59871e: Merge "Resource resolution fixes." into lmp-dev

* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.