Merge change 21055 into donut

* changes:
  Lock in final resource identifiers.