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