Story 1609: Portal change.
Merge branch 'canfar_dev'