LPS-31880 Broken when domain contains port
LPS-31880 Source formatting