R1:9e78f33847b7

Also update the resource map

This is not my morning.

Auditors: chad