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