Merge "Bug 5342: Fix for SF appearing as Endpoint"