Add workaround for named Portal instance scenario.
Merge branch '#112/add-workaround-for-named-portal-instance' into develop