Merge "Set up final resource identifiers." into lmp-dev