am 1379b508: Merge "Set up final resource identifiers." into lmp-dev

* commit '1379b5081522e03be4f2d9063321040945bed03a':
  Set up final resource identifiers.