sp-portal related changes