Merge "Fix render errors on GENERIC-RESOURCE-API swagger"