Merge "GENERIC-RESOURCE-API template fixes"