Merge "Fix references to resources for Spa" into main