[5.4.10] Pypi API change requires two remote repositories [RTFACT-16563]