Wrong APIcast public base url format while creating a new product in 3scale admin portal

Issue

• Working example: create a new API named "test", the staging public base url should be: https://test-{TENANT_NAME}-apicast-staging.{WILDCARD_DOMAIN}:443
• Current broken behaviour: the urls autogenerated are: https://test--apicast-staging.{WILDCARD_DOMAIN}:443 & https://test--apicast-production.{WILDCARD_DOMAIN}:443
• When we create a new product we can see the missing tenant name (e.g.3scale) and a double hyphen "--" appears in APicast "Staging Public Base URL" and "Production Public Base URL", How to fix this issue?
• Does change in "Developer Portal Site" FQDN from default to custom value will cause any issue?