fix prefix handling
Merge branch 'feature-portal' into development
change version to 1.0.0-beta-r11