Merge "Resource resolution fixes." into lmp-dev