[#61143512] Fixed the embedded functionality so that there are fallbacks to help people having problems.
[#61143512] Fixed an issue where the base is not set for the proxy.
Merge pull request #51 from travist/sid-61143512

[PRODFIX][#61143512] Fixed the embedded functionality so that there are fallbacks to help people having problems.