Quickfix SWC-663
CR fixes
CR fixes
Merge pull request #51 from xschildw/alternative-portal

Quickfix SWC-663