LPS-34937 Manual changes
LPS-34868 Shindig expects hardcoded schemes