diff --git a/cli/operations/account/login.go b/cli/operations/account/login.go
index fd78a5377..799758f0d 100644
--- a/cli/operations/account/login.go
+++ b/cli/operations/account/login.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/harness/gitness/cli/provide"
 	"github.com/harness/gitness/cli/textui"
+	"github.com/harness/gitness/internal/api/controller/user"
 
 	"gopkg.in/alecthomas/kingpin.v2"
 )
@@ -21,19 +22,25 @@ type loginCommand struct {
 func (c *loginCommand) run(*kingpin.ParseContext) error {
 	ss := provide.NewSession()
 
-	username, password := textui.Credentials()
+	loginIdentifier, password := textui.Credentials()
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
-	ts, err := provide.OpenClient(c.server).Login(ctx, username, password)
+	in := &user.LoginInput{
+		LoginIdentifier: loginIdentifier,
+		Password:        password,
+	}
+
+	ts, err := provide.OpenClient(c.server).Login(ctx, in)
 	if err != nil {
 		return err
 	}
 
 	return ss.
 		SetURI(c.server).
-		SetExpiresAt(ts.Token.ExpiresAt).
+		// login token always has an expiry date
+		SetExpiresAt(*ts.Token.ExpiresAt).
 		SetAccessToken(ts.AccessToken).
 		Store()
 }
diff --git a/cli/operations/account/register.go b/cli/operations/account/register.go
index e9941ee71..e3343abb4 100644
--- a/cli/operations/account/register.go
+++ b/cli/operations/account/register.go
@@ -11,6 +11,7 @@ import (
 	"github.com/harness/gitness/cli/provide"
 	"github.com/harness/gitness/cli/session"
 	"github.com/harness/gitness/cli/textui"
+	"github.com/harness/gitness/internal/api/controller/user"
 
 	"gopkg.in/alecthomas/kingpin.v2"
 )
@@ -30,18 +31,26 @@ type registerCommand struct {
 func (c *registerCommand) run(*kingpin.ParseContext) error {
 	ss := provide.NewSession()
 
-	username, name, email, password := textui.Registration()
+	uid, displayName, email, password := textui.Registration()
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
-	ts, err := provide.OpenClient(c.server).Register(ctx, username, name, email, password)
+	input := &user.RegisterInput{
+		UID:         uid,
+		Email:       email,
+		DisplayName: displayName,
+		Password:    password,
+	}
+
+	ts, err := provide.OpenClient(c.server).Register(ctx, input)
 	if err != nil {
 		return err
 	}
 
 	return ss.
 		SetURI(c.server).
-		SetExpiresAt(ts.Token.ExpiresAt).
+		// register token always has an expiry date
+		SetExpiresAt(*ts.Token.ExpiresAt).
 		SetAccessToken(ts.AccessToken).
 		Store()
 }
diff --git a/cli/operations/user/create_pat.go b/cli/operations/user/create_pat.go
index 94bea35e8..f9875bff2 100644
--- a/cli/operations/user/create_pat.go
+++ b/cli/operations/user/create_pat.go
@@ -16,6 +16,7 @@ import (
 	"github.com/harness/gitness/types/enum"
 
 	"github.com/drone/funcmap"
+	"github.com/gotidy/ptr"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -38,9 +39,14 @@ func (c *createPATCommand) run(*kingpin.ParseContext) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
+	var lifeTime *time.Duration
+	if c.lifetimeInS > 0 {
+		lifeTime = ptr.Duration(time.Duration(int64(time.Second) * c.lifetimeInS))
+	}
+
 	in := user.CreateTokenInput{
 		UID:      c.uid,
-		Lifetime: time.Duration(int64(time.Second) * c.lifetimeInS),
+		Lifetime: lifeTime,
 		Grants:   enum.AccessGrantAll,
 	}
 
@@ -71,7 +77,7 @@ func registerCreatePAT(app *kingpin.CmdClause) {
 		Required().StringVar(&c.uid)
 
 	cmd.Arg("lifetime", "the lifetime of the token in seconds").
-		Required().Int64Var(&c.lifetimeInS)
+		Int64Var(&c.lifetimeInS)
 
 	cmd.Flag("json", "json encode the output").
 		BoolVar(&c.json)
diff --git a/cli/server/server.go b/cli/server/server.go
index 3d6cd229a..7f95e8f0d 100644
--- a/cli/server/server.go
+++ b/cli/server/server.go
@@ -24,12 +24,6 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
-const (
-	// GraceFullShutdownTime defines the max time we wait when shutting down a server.
-	// 5min should be enough for most git clones to complete.
-	GraceFullShutdownTime = 300 * time.Second
-)
-
 type command struct {
 	envfile      string
 	enableGitRPC bool
@@ -109,7 +103,7 @@ func (c *command) run(*kingpin.ParseContext) error {
 	log.Info().Msg("shutting down gracefully (press Ctrl+C again to force)")
 
 	// shutdown servers gracefully
-	shutdownCtx, cancel := context.WithTimeout(context.Background(), GraceFullShutdownTime)
+	shutdownCtx, cancel := context.WithTimeout(context.Background(), config.GracefulShutdownTime)
 	defer cancel()
 
 	if sErr := shutdownHTTP(shutdownCtx); sErr != nil {
diff --git a/cli/textui/input.go b/cli/textui/input.go
index 1aa93be8f..b6491ecbd 100644
--- a/cli/textui/input.go
+++ b/cli/textui/input.go
@@ -14,31 +14,41 @@ import (
 	"golang.org/x/term"
 )
 
-// Registration returns the username, name, email and password from stdin.
+// Registration returns the userID, displayName, email and password from stdin.
 func Registration() (string, string, string, string) {
-	return Username(), Name(), Email(), Password()
+	return UserID(), DisplayName(), Email(), Password()
 }
 
-// Credentials returns the username and password from stdin.
+// Credentials returns the login identifier and password from stdin.
 func Credentials() (string, string) {
-	return Username(), Password()
+	return LoginIdentifier(), Password()
 }
 
-// Username returns the username from stdin.
-func Username() string {
+// UserID returns the user ID from stdin.
+func UserID() string {
 	reader := bufio.NewReader(os.Stdin)
 
-	fmt.Print("Enter Username: ")
-	username, _ := reader.ReadString('\n')
+	fmt.Print("Enter User ID: ")
+	uid, _ := reader.ReadString('\n')
 
-	return strings.TrimSpace(username)
+	return strings.TrimSpace(uid)
 }
 
-// Name returns the name from stdin.
-func Name() string {
+// LoginIdentifier returns the login identifier from stdin.
+func LoginIdentifier() string {
 	reader := bufio.NewReader(os.Stdin)
 
-	fmt.Print("Enter Name: ")
+	fmt.Print("Enter User ID or Email: ")
+	id, _ := reader.ReadString('\n')
+
+	return strings.TrimSpace(id)
+}
+
+// DisplayName returns the display name from stdin.
+func DisplayName() string {
+	reader := bufio.NewReader(os.Stdin)
+
+	fmt.Print("Enter Display Name: ")
 	name, _ := reader.ReadString('\n')
 
 	return strings.TrimSpace(name)
diff --git a/client/client.go b/client/client.go
index 2dc057a3f..6b3ec24c4 100644
--- a/client/client.go
+++ b/client/client.go
@@ -59,27 +59,18 @@ func (c *HTTPClient) SetDebug(debug bool) {
 }
 
 // Login authenticates the user and returns a JWT token.
-func (c *HTTPClient) Login(ctx context.Context, username, password string) (*types.TokenResponse, error) {
-	form := &url.Values{}
-	form.Add("username", username)
-	form.Add("password", password)
+func (c *HTTPClient) Login(ctx context.Context, input *user.LoginInput) (*types.TokenResponse, error) {
 	out := new(types.TokenResponse)
 	uri := fmt.Sprintf("%s/api/v1/login", c.base)
-	err := c.post(ctx, uri, true, form, out)
+	err := c.post(ctx, uri, true, input, out)
 	return out, err
 }
 
 // Register registers a new  user and returns a JWT token.
-func (c *HTTPClient) Register(ctx context.Context,
-	username, displayName, email, password string) (*types.TokenResponse, error) {
-	form := &url.Values{}
-	form.Add("username", username)
-	form.Add("displayname", displayName)
-	form.Add("email", email)
-	form.Add("password", password)
+func (c *HTTPClient) Register(ctx context.Context, input *user.RegisterInput) (*types.TokenResponse, error) {
 	out := new(types.TokenResponse)
 	uri := fmt.Sprintf("%s/api/v1/register", c.base)
-	err := c.post(ctx, uri, true, form, out)
+	err := c.post(ctx, uri, true, input, out)
 	return out, err
 }
 
@@ -201,12 +192,7 @@ func (c *HTTPClient) stream(ctx context.Context, rawurl, method string, noToken
 	var buf io.ReadWriter
 	if in != nil {
 		buf = &bytes.Buffer{}
-		// if posting form data, encode the form values.
-		if form, ok := in.(*url.Values); ok {
-			if _, err = io.WriteString(buf, form.Encode()); err != nil {
-				log.Err(err).Msg("in stream method")
-			}
-		} else if err = json.NewEncoder(buf).Encode(in); err != nil {
+		if err = json.NewEncoder(buf).Encode(in); err != nil {
 			return nil, err
 		}
 	}
diff --git a/client/interface.go b/client/interface.go
index 726ea185b..9c0b97002 100644
--- a/client/interface.go
+++ b/client/interface.go
@@ -14,10 +14,10 @@ import (
 // Client to access the remote APIs.
 type Client interface {
 	// Login authenticates the user and returns a JWT token.
-	Login(ctx context.Context, username, password string) (*types.TokenResponse, error)
+	Login(ctx context.Context, input *user.LoginInput) (*types.TokenResponse, error)
 
 	// Register registers a new  user and returns a JWT token.
-	Register(ctx context.Context, username, name, email, password string) (*types.TokenResponse, error)
+	Register(ctx context.Context, input *user.RegisterInput) (*types.TokenResponse, error)
 
 	// Self returns the currently authenticated user.
 	Self(ctx context.Context) (*types.User, error)
diff --git a/cmd/gitness/wire_gen.go b/cmd/gitness/wire_gen.go
index 96c124698..d1911d729 100644
--- a/cmd/gitness/wire_gen.go
+++ b/cmd/gitness/wire_gen.go
@@ -49,16 +49,24 @@ import (
 
 func initSystem(ctx context.Context, config *types.Config) (*server.System, error) {
 	principalUID := check.ProvidePrincipalUIDCheck()
-	authorizer := authz.ProvideAuthorizer()
 	databaseConfig := server.ProvideDatabaseConfig(config)
 	db, err := database.ProvideDatabase(ctx, databaseConfig)
 	if err != nil {
 		return nil, err
 	}
+	pathTransformation := store.ProvidePathTransformation()
+	pathStore := database.ProvidePathStore(db, pathTransformation)
+	pathCache := cache.ProvidePathCache(pathStore, pathTransformation)
+	spaceStore := database.ProvideSpaceStore(db, pathCache)
+	principalInfoView := database.ProvidePrincipalInfoView(db)
+	principalInfoCache := cache.ProvidePrincipalInfoCache(principalInfoView)
+	membershipStore := database.ProvideMembershipStore(db, principalInfoCache)
+	permissionCache := authz.ProvidePermissionCache(spaceStore, membershipStore)
+	authorizer := authz.ProvideAuthorizer(permissionCache)
 	principalUIDTransformation := store.ProvidePrincipalUIDTransformation()
 	principalStore := database.ProvidePrincipalStore(db, principalUIDTransformation)
 	tokenStore := database.ProvideTokenStore(db)
-	controller := user.NewController(principalUID, authorizer, principalStore, tokenStore, config)
+	controller := user.NewController(principalUID, authorizer, principalStore, tokenStore, membershipStore)
 	serviceController := service.NewController(principalUID, authorizer, principalStore)
 	bootstrapBootstrap := bootstrap.ProvideBootstrap(config, controller, serviceController)
 	authenticator := authn.ProvideAuthenticator(principalStore, tokenStore)
@@ -67,11 +75,7 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro
 		return nil, err
 	}
 	pathUID := check.ProvidePathUIDCheck()
-	pathTransformation := store.ProvidePathTransformation()
-	pathStore := database.ProvidePathStore(db, pathTransformation)
-	pathCache := cache.ProvidePathCache(pathStore, pathTransformation)
 	repoStore := database.ProvideRepoStore(db, pathCache)
-	spaceStore := database.ProvideSpaceStore(db, pathCache)
 	gitrpcConfig, err := server.ProvideGitRPCClientConfig()
 	if err != nil {
 		return nil, err
@@ -81,9 +85,7 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro
 		return nil, err
 	}
 	repoController := repo.ProvideController(config, db, provider, pathUID, authorizer, pathStore, repoStore, spaceStore, principalStore, gitrpcInterface)
-	spaceController := space.ProvideController(db, provider, pathUID, authorizer, pathStore, spaceStore, repoStore, principalStore, repoController)
-	principalInfoView := database.ProvidePrincipalInfoView(db)
-	principalInfoCache := cache.ProvidePrincipalInfoCache(principalInfoView)
+	spaceController := space.ProvideController(db, provider, pathUID, authorizer, pathStore, spaceStore, repoStore, principalStore, repoController, membershipStore)
 	pullReqStore := database.ProvidePullReqStore(db, principalInfoCache)
 	pullReqActivityStore := database.ProvidePullReqActivityStore(db, principalInfoCache)
 	codeCommentView := database.ProvideCodeCommentView(db)
@@ -135,7 +137,8 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro
 	githookController := githook.ProvideController(db, authorizer, principalStore, repoStore, eventsReporter)
 	serviceaccountController := serviceaccount.NewController(principalUID, authorizer, principalStore, spaceStore, repoStore, tokenStore)
 	principalController := principal.ProvideController(principalStore)
-	checkController := check2.ProvideController(db, authorizer, repoStore, gitrpcInterface)
+	checkStore := database.ProvideCheckStore(db, principalInfoCache)
+	checkController := check2.ProvideController(db, authorizer, repoStore, checkStore, gitrpcInterface)
 	systemController := system.NewController(principalStore, config)
 	apiHandler := router.ProvideAPIHandler(config, authenticator, repoController, spaceController, pullreqController, webhookController, githookController, serviceaccountController, controller, principalController, checkController, systemController)
 	gitHandler := router.ProvideGitHandler(config, provider, repoStore, authenticator, authorizer, gitrpcInterface)
diff --git a/gitrpc/client.go b/gitrpc/client.go
index 1c967f131..e496e53f3 100644
--- a/gitrpc/client.go
+++ b/gitrpc/client.go
@@ -6,10 +6,12 @@ package gitrpc
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/harness/gitness/gitrpc/rpc"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
 )
 
@@ -34,6 +36,7 @@ func New(config Config) (*Client, error) {
 
 	// preparate all grpc options
 	grpcOpts := []grpc.DialOption{
+		grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"loadBalancingPolicy":"%s"}`, config.LoadBalancingPolicy)),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithChainUnaryInterceptor(
 			logIntc.UnaryClientInterceptor(),
@@ -41,6 +44,18 @@ func New(config Config) (*Client, error) {
 		grpc.WithChainStreamInterceptor(
 			logIntc.StreamClientInterceptor(),
 		),
+		grpc.WithConnectParams(
+			grpc.ConnectParams{
+				// This config optimizes for connection recovery instead of load reduction.
+				// NOTE: we only expect limited number of internal clients, thus low number of connections.
+				Backoff: backoff.Config{
+					BaseDelay:  100 * time.Millisecond,
+					Multiplier: 1.6, // same as default
+					Jitter:     0.2, // same as default
+					MaxDelay:   time.Second,
+				},
+			},
+		),
 	}
 
 	conn, err := grpc.Dial(config.Addr, grpcOpts...)
diff --git a/gitrpc/config.go b/gitrpc/config.go
index fe95deaa1..95141a6bb 100644
--- a/gitrpc/config.go
+++ b/gitrpc/config.go
@@ -10,7 +10,8 @@ import (
 
 // Config represents the config for the gitrpc client.
 type Config struct {
-	Addr string `envconfig:"GITRPC_CLIENT_ADDR" default:"127.0.0.1:3001"`
+	Addr                string `envconfig:"GITRPC_CLIENT_ADDR" default:"127.0.0.1:3001"`
+	LoadBalancingPolicy string `envconfig:"GITRPC_CLIENT_LOAD_BALANCING_POLICY" default:"pick_first"`
 }
 
 func (c *Config) Validate() error {
diff --git a/gitrpc/interface.go b/gitrpc/interface.go
index b4ee14416..2a4941407 100644
--- a/gitrpc/interface.go
+++ b/gitrpc/interface.go
@@ -17,7 +17,7 @@ type Interface interface {
 	GetSubmodule(ctx context.Context, params *GetSubmoduleParams) (*GetSubmoduleOutput, error)
 	GetBlob(ctx context.Context, params *GetBlobParams) (*GetBlobOutput, error)
 	CreateBranch(ctx context.Context, params *CreateBranchParams) (*CreateBranchOutput, error)
-	CreateTag(ctx context.Context, params *CreateTagParams) (*CreateTagOutput, error)
+	CreateCommitTag(ctx context.Context, params *CreateCommitTagParams) (*CreateCommitTagOutput, error)
 	DeleteTag(ctx context.Context, params *DeleteTagParams) error
 	GetBranch(ctx context.Context, params *GetBranchParams) (*GetBranchOutput, error)
 	DeleteBranch(ctx context.Context, params *DeleteBranchParams) error
diff --git a/gitrpc/internal/gitea/tag.go b/gitrpc/internal/gitea/tag.go
index 41e871bef..55817f8c8 100644
--- a/gitrpc/internal/gitea/tag.go
+++ b/gitrpc/internal/gitea/tag.go
@@ -39,16 +39,38 @@ func (g Adapter) GetAnnotatedTags(ctx context.Context, repoPath string, shas []s
 	return giteaGetAnnotatedTags(ctx, repoPath, shas)
 }
 
-func (g Adapter) CreateAnnotatedTag(
+// CreateTag creates the tag pointing at the provided SHA (could be any type, e.g. commit, tag, blob, ...)
+func (g Adapter) CreateTag(
 	ctx context.Context,
 	repoPath string,
-	request *types.CreateTagRequest,
+	name string,
+	targetSHA string,
+	opts *types.CreateTagOptions,
 ) error {
-	cmd := gitea.NewCommand(ctx, "tag", "-a", "-m", request.Message, "--", request.Name, request.TargetSha)
-	env := []string{
-		"GIT_COMMITTER_NAME=" + request.TaggerName,
-		"GIT_COMMITTER_EMAIL=" + request.TaggerEmail,
+	args := []string{
+		"tag",
 	}
+	env := []string{}
+
+	if opts != nil && opts.Message != "" {
+		args = append(args,
+			"-m",
+			opts.Message,
+		)
+		env = append(env,
+			"GIT_COMMITTER_NAME="+opts.Tagger.Identity.Name,
+			"GIT_COMMITTER_EMAIL="+opts.Tagger.Identity.Email,
+			"GIT_COMMITTER_DATE="+opts.Tagger.When.Format(time.RFC3339),
+		)
+	}
+
+	args = append(args,
+		"--",
+		name,
+		targetSHA,
+	)
+
+	cmd := gitea.NewCommand(ctx, args...)
 	_, _, err := cmd.RunStdString(&gitea.RunOpts{Dir: repoPath, Env: env})
 	if err != nil {
 		return processGiteaErrorf(err, "Service failed to create a tag")
diff --git a/gitrpc/internal/service/branch.go b/gitrpc/internal/service/branch.go
index f4ef213dd..91da500ba 100644
--- a/gitrpc/internal/service/branch.go
+++ b/gitrpc/internal/service/branch.go
@@ -62,7 +62,7 @@ func (s ReferenceService) CreateBranch(ctx context.Context,
 	}
 
 	// get target commit (as target could be branch/tag/commit, and tag can't be pushed using source:destination syntax)
-	targetCommit, err := sharedRepo.GetCommit(strings.TrimSpace(request.GetTarget()))
+	targetCommit, err := s.adapter.GetCommit(ctx, sharedRepo.tmpPath, strings.TrimSpace(request.GetTarget()))
 	if git.IsErrNotExist(err) {
 		return nil, ErrNotFoundf("target '%s' doesn't exist", request.GetTarget())
 	}
@@ -71,7 +71,7 @@ func (s ReferenceService) CreateBranch(ctx context.Context,
 	}
 
 	// push to new branch (all changes should go through push flow for hooks and other safety meassures)
-	err = sharedRepo.PushCommitToBranch(ctx, base, targetCommit.ID.String(), request.GetBranchName())
+	err = sharedRepo.PushCommitToBranch(ctx, base, targetCommit.SHA, request.GetBranchName())
 	if err != nil {
 		return nil, processGitErrorf(err, "failed to push new branch '%s'", request.GetBranchName())
 	}
diff --git a/gitrpc/internal/service/interface.go b/gitrpc/internal/service/interface.go
index d790f5b8c..fb1bd445e 100644
--- a/gitrpc/internal/service/interface.go
+++ b/gitrpc/internal/service/interface.go
@@ -41,7 +41,7 @@ type GitAdapter interface {
 	GetFullCommitID(ctx context.Context, repoPath, shortID string) (string, error)
 	GetAnnotatedTag(ctx context.Context, repoPath string, sha string) (*types.Tag, error)
 	GetAnnotatedTags(ctx context.Context, repoPath string, shas []string) ([]types.Tag, error)
-	CreateAnnotatedTag(ctx context.Context, repoPath string, request *types.CreateTagRequest) error
+	CreateTag(ctx context.Context, repoPath string, name string, targetSHA string, opts *types.CreateTagOptions) error
 	GetBranch(ctx context.Context, repoPath string, branchName string) (*types.Branch, error)
 	GetCommitDivergences(ctx context.Context, repoPath string,
 		requests []types.CommitDivergenceRequest, max int32) ([]types.CommitDivergence, error)
diff --git a/gitrpc/internal/service/mapping.go b/gitrpc/internal/service/mapping.go
index 8d6c81c1c..e00078465 100644
--- a/gitrpc/internal/service/mapping.go
+++ b/gitrpc/internal/service/mapping.go
@@ -156,10 +156,11 @@ func mapRenameDetails(renameDetails []types.PathRenameDetails) []*rpc.RenameDeta
 	return renameDetailsList
 }
 
-func mapCommitTag(tag *types.Tag) *rpc.CommitTag {
+func mapAnnotatedTag(tag *types.Tag) *rpc.CommitTag {
 	return &rpc.CommitTag{
 		Name:        tag.Name,
 		Sha:         tag.Sha,
+		Title:       tag.Title,
 		Message:     tag.Message,
 		Tagger:      mapGitSignature(tag.Tagger),
 		IsAnnotated: true,
diff --git a/gitrpc/internal/service/repo.go b/gitrpc/internal/service/repo.go
index 7d49b9018..e11c6a266 100644
--- a/gitrpc/internal/service/repo.go
+++ b/gitrpc/internal/service/repo.go
@@ -440,7 +440,7 @@ func (s RepositoryService) HashRepository(
 
 	res, err := hasher.Hash(source)
 	if err != nil {
-		return nil, ErrInternalf("failed to hash repo refs", err)
+		return nil, processGitErrorf(err, "failed to hash repository")
 	}
 
 	return &rpc.HashRepositoryResponse{
diff --git a/gitrpc/internal/service/tag.go b/gitrpc/internal/service/tag.go
index 21108ce8a..d12517460 100644
--- a/gitrpc/internal/service/tag.go
+++ b/gitrpc/internal/service/tag.go
@@ -6,7 +6,10 @@ package service
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strings"
+	"time"
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
@@ -46,31 +49,53 @@ func (s ReferenceService) ListCommitTags(request *rpc.ListCommitTagsRequest,
 		}
 	}
 
+	// populate annotation data for all annotated tags
 	if len(annotatedTagSHAs) > 0 {
-		var gitTags []types.Tag
-		gitTags, err = s.adapter.GetAnnotatedTags(ctx, repoPath, annotatedTagSHAs)
+		var aTags []types.Tag
+		aTags, err = s.adapter.GetAnnotatedTags(ctx, repoPath, annotatedTagSHAs)
 		if err != nil {
 			return processGitErrorf(err, "failed to get annotated tag")
 		}
 
-		ai := 0 // since only some tags are annotated, we need second index
-		for i := range tags {
-			if !tags[i].IsAnnotated {
+		ai := 0 // index for annotated tags
+		ri := 0 // read index for all tags
+		wi := 0 // write index for all tags (as we might remove some non-commit tags)
+		for ; ri < len(tags); ri++ {
+			// always copy the current read element to the latest write position (doesn't mean it's kept)
+			tags[wi] = tags[ri]
+			commitSHAs[wi] = commitSHAs[ri]
+
+			// keep the tag as is if it's not annotated
+			if !tags[ri].IsAnnotated {
+				wi++
+				continue
+			}
+
+			// filter out annotated tags that don't point to commit objects (blobs, trees, nested tags, ...)
+			// we don't actually wanna write it, so keep write index
+			// TODO: Support proper pagination: https://harness.atlassian.net/browse/CODE-669
+			if aTags[ai].TargetType != types.GitObjectTypeCommit {
+				ai++
 				continue
 			}
 
 			// correct the commitSHA for the annotated tag (currently it is the tag sha, not the commit sha)
 			// NOTE: This is required as otherwise gitea will wrongly set the committer to the tagger signature.
-			commitSHAs[i] = gitTags[ai].TargetSha
+			commitSHAs[wi] = aTags[ai].TargetSha
 
 			// update tag information with annotation details
 			// NOTE: we keep the name from the reference and ignore the annotated name (similar to github)
-			tags[i].Message = gitTags[ai].Message
-			tags[i].Title = gitTags[ai].Title
-			tags[i].Tagger = mapGitSignature(gitTags[ai].Tagger)
+			tags[wi].Message = aTags[ai].Message
+			tags[wi].Title = aTags[ai].Title
+			tags[wi].Tagger = mapGitSignature(aTags[ai].Tagger)
 
 			ai++
+			wi++
 		}
+
+		// truncate slices based on what was removed
+		tags = tags[:wi]
+		commitSHAs = commitSHAs[:wi]
 	}
 
 	// get commits if needed (single call for perf savings: 1s-4s vs 5s-20s)
@@ -185,10 +210,10 @@ func listCommitTagsWalkReferencesHandler(tags *[]*rpc.CommitTag) types.WalkRefer
 		return nil
 	}
 }
-func (s ReferenceService) CreateTag(
+func (s ReferenceService) CreateCommitTag(
 	ctx context.Context,
-	request *rpc.CreateTagRequest,
-) (*rpc.CreateTagResponse, error) {
+	request *rpc.CreateCommitTagRequest,
+) (*rpc.CreateCommitTagResponse, error) {
 	base := request.GetBase()
 	if base == nil {
 		return nil, types.ErrBaseCannotBeEmpty
@@ -208,35 +233,87 @@ func (s ReferenceService) CreateTag(
 
 	defer sharedRepo.Close(ctx)
 
+	// clone repo (with HEAD branch - target might be anything)
 	err = sharedRepo.Clone(ctx, "")
 	if err != nil {
-		return nil, processGitErrorf(err, "failed to clone shared repo with branch '%s'", request.GetSha())
+		return nil, processGitErrorf(err, "failed to clone shared repo")
 	}
-	actor := request.GetBase().GetActor()
-	createTagRequest := types.CreateTagRequest{
-		Name:        request.GetTagName(),
-		TargetSha:   request.GetSha(),
-		Message:     request.GetMessage(),
-		TaggerEmail: actor.GetEmail(),
-		TaggerName:  actor.GetName(),
-	}
-	err = s.adapter.CreateAnnotatedTag(ctx, sharedRepo.tmpPath, &createTagRequest)
 
+	// get target commit (as target could be branch/tag/commit, and tag can't be pushed using source:destination syntax)
+	// NOTE: in case the target is an annotated tag, the targetCommit title and message are that of the tag, not the commit
+	targetCommit, err := s.adapter.GetCommit(ctx, sharedRepo.tmpPath, strings.TrimSpace(request.GetTarget()))
+	if git.IsErrNotExist(err) {
+		return nil, ErrNotFoundf("target '%s' doesn't exist", request.GetTarget())
+	}
 	if err != nil {
-		return nil, processGitErrorf(err, "Failed to create tag %s - %s", request.GetTagName(), err.Error())
+		return nil, fmt.Errorf("failed to get commit id for target '%s': %w", request.GetTarget(), err)
+	}
+
+	tagger := base.GetActor()
+	if request.GetTagger() != nil {
+		tagger = request.GetTagger()
+	}
+	taggerDate := time.Now().UTC()
+	if request.GetTaggerDate() != 0 {
+		taggerDate = time.Unix(request.GetTaggerDate(), 0)
+	}
+
+	createTagRequest := &types.CreateTagOptions{
+		Message: request.GetMessage(),
+		Tagger: types.Signature{
+			Identity: types.Identity{
+				Name:  tagger.Name,
+				Email: tagger.Email,
+			},
+			When: taggerDate,
+		},
+	}
+	err = s.adapter.CreateTag(
+		ctx,
+		sharedRepo.tmpPath,
+		request.GetTagName(),
+		targetCommit.SHA,
+		createTagRequest)
+	if errors.Is(err, types.ErrAlreadyExists) {
+		return nil, ErrAlreadyExistsf("tag '%s' already exists", request.GetTagName())
+	}
+	if err != nil {
+		return nil, processGitErrorf(err, "Failed to create tag '%s'", request.GetTagName())
 	}
 
 	if err = sharedRepo.PushTag(ctx, base, request.GetTagName()); err != nil {
-		return nil, processGitErrorf(err, "Failed to push the tag %s to remote", request.GetTagName())
+		return nil, processGitErrorf(err, "Failed to push the tag to remote")
 	}
 
-	tag, err := s.adapter.GetAnnotatedTag(ctx, repoPath, request.GetTagName())
+	var commitTag *rpc.CommitTag
+	if request.GetMessage() != "" {
+		tag, err := s.adapter.GetAnnotatedTag(ctx, repoPath, request.GetTagName())
+		if err != nil {
+			return nil, fmt.Errorf("failed to read annotated tag after creation: %w", err)
+		}
+		commitTag = mapAnnotatedTag(tag)
+	} else {
+		commitTag = &rpc.CommitTag{
+			Name:        request.GetTagName(),
+			IsAnnotated: false,
+			Sha:         targetCommit.SHA,
+		}
+	}
 
+	// gitea overwrites some commit details in case getCommit(ref) was called with ref being a tag
+	// To avoid this issue, let's get the commit again using the actual id of the commit
+	// TODO: can we do this nicer?
+	rawCommit, err := s.adapter.GetCommit(ctx, repoPath, targetCommit.SHA)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to get the raw commit '%s' after tag creation: %w", targetCommit.SHA, err)
 	}
-	commitTag := mapCommitTag(tag)
-	return &rpc.CreateTagResponse{Tag: commitTag}, nil
+
+	commitTag.Commit, err = mapGitCommit(rawCommit)
+	if err != nil {
+		return nil, fmt.Errorf("failed to map target commit after tag creation: %w", err)
+	}
+
+	return &rpc.CreateCommitTagResponse{Tag: commitTag}, nil
 }
 
 func (s ReferenceService) DeleteTag(
@@ -262,7 +339,8 @@ func (s ReferenceService) DeleteTag(
 
 	defer sharedRepo.Close(ctx)
 
-	err = sharedRepo.Clone(ctx, request.GetTagName())
+	// clone repo (with HEAD branch - tag target might be anything)
+	err = sharedRepo.Clone(ctx, "")
 	if err != nil {
 		return nil, processGitErrorf(err, "failed to clone shared repo with tag '%s'", request.GetTagName())
 	}
diff --git a/gitrpc/internal/types/types.go b/gitrpc/internal/types/types.go
index deb6c789d..0d9cff775 100644
--- a/gitrpc/internal/types/types.go
+++ b/gitrpc/internal/types/types.go
@@ -150,12 +150,13 @@ type Tag struct {
 	Tagger     Signature
 }
 
-type CreateTagRequest struct {
-	Name        string
-	TargetSha   string
-	Message     string
-	TaggerName  string
-	TaggerEmail string
+type CreateTagOptions struct {
+	// Message is the optional message the tag will be created with - if the message is empty
+	// the tag will be lightweight, otherwise it'll be annotated.
+	Message string
+
+	// Tagger is the information used in case the tag is annotated (Message is provided).
+	Tagger Signature
 }
 
 // Signature represents the Author or Committer information.
diff --git a/gitrpc/kuberesolver.go b/gitrpc/kuberesolver.go
new file mode 100644
index 000000000..888a664f1
--- /dev/null
+++ b/gitrpc/kuberesolver.go
@@ -0,0 +1,13 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package gitrpc
+
+import (
+	"github.com/sercand/kuberesolver/v5"
+)
+
+func init() {
+	kuberesolver.RegisterInCluster()
+}
diff --git a/gitrpc/merge.go b/gitrpc/merge.go
index 66d05b400..4a87607d9 100644
--- a/gitrpc/merge.go
+++ b/gitrpc/merge.go
@@ -23,13 +23,17 @@ type MergeParams struct {
 	Title       string
 	Message     string
 
-	// Committer overwrites the git committer used for committing the files (optional, default: actor)
+	// Committer overwrites the git committer used for committing the files
+	// (optional, default: actor)
 	Committer *Identity
-	// CommitterDate overwrites the git committer date used for committing the files (optional, default: current time)
+	// CommitterDate overwrites the git committer date used for committing the files
+	// (optional, default: current time on server)
 	CommitterDate *time.Time
-	// Author overwrites the git author used for committing the files (optional, default: committer)
+	// Author overwrites the git author used for committing the files
+	// (optional, default: committer)
 	Author *Identity
-	// AuthorDate overwrites the git author date used for committing the files (optional, default: committer date)
+	// AuthorDate overwrites the git author date used for committing the files
+	// (optional, default: committer date)
 	AuthorDate *time.Time
 
 	RefType enum.RefType
diff --git a/gitrpc/operations.go b/gitrpc/operations.go
index 43cc22fc0..c680c7cb8 100644
--- a/gitrpc/operations.go
+++ b/gitrpc/operations.go
@@ -45,13 +45,17 @@ type CommitFilesParams struct {
 	NewBranch string
 	Actions   []CommitFileAction
 
-	// Committer overwrites the git committer used for committing the files (optional, default: actor)
+	// Committer overwrites the git committer used for committing the files
+	// (optional, default: actor)
 	Committer *Identity
-	// CommitterDate overwrites the git committer date used for committing the files (optional, default: current time)
+	// CommitterDate overwrites the git committer date used for committing the files
+	// (optional, default: current time on server)
 	CommitterDate *time.Time
-	// Author overwrites the git author used for committing the files (optional, default: committer)
+	// Author overwrites the git author used for committing the files
+	// (optional, default: committer)
 	Author *Identity
-	// AuthorDate overwrites the git author date used for committing the files (optional, default: committer date)
+	// AuthorDate overwrites the git author date used for committing the files
+	// (optional, default: committer date)
 	AuthorDate *time.Time
 }
 
diff --git a/gitrpc/proto/ref.proto b/gitrpc/proto/ref.proto
index 25e5148ba..b9f1fa025 100644
--- a/gitrpc/proto/ref.proto
+++ b/gitrpc/proto/ref.proto
@@ -11,21 +11,22 @@ service ReferenceService {
   rpc DeleteBranch(DeleteBranchRequest) returns (DeleteBranchResponse);
   rpc ListBranches(ListBranchesRequest) returns (stream ListBranchesResponse);
   rpc ListCommitTags(ListCommitTagsRequest) returns (stream ListCommitTagsResponse);
-  rpc CreateTag(CreateTagRequest) returns (CreateTagResponse);
+  rpc CreateCommitTag(CreateCommitTagRequest) returns (CreateCommitTagResponse);
   rpc DeleteTag(DeleteTagRequest) returns (UpdateRefResponse);
   rpc GetRef(GetRefRequest) returns (GetRefResponse);
   rpc UpdateRef(UpdateRefRequest) returns (UpdateRefResponse);
 }
 
-message CreateTagRequest {
+message CreateCommitTagRequest {
   WriteRequest base  = 1;
-  string sha         = 2;
-  string tag_name    = 3;
+  string tag_name    = 2;
+  string target      = 3;
   string message     = 4;
-
+  Identity tagger    = 5;
+  int64 taggerDate   = 6;
 }
 
-message CreateTagResponse {
+message CreateCommitTagResponse {
   CommitTag tag = 1;
 }
 
diff --git a/gitrpc/repo.go b/gitrpc/repo.go
index c89010a39..07285f291 100644
--- a/gitrpc/repo.go
+++ b/gitrpc/repo.go
@@ -34,13 +34,17 @@ type CreateRepositoryParams struct {
 	DefaultBranch string
 	Files         []File
 
-	// Committer overwrites the git committer used for committing the files (optional, default: actor)
+	// Committer overwrites the git committer used for committing the files
+	// (optional, default: actor)
 	Committer *Identity
-	// CommitterDate overwrites the git committer date used for committing the files (optional, default: current time)
+	// CommitterDate overwrites the git committer date used for committing the files
+	// (optional, default: current time on server)
 	CommitterDate *time.Time
-	// Author overwrites the git author used for committing the files (optional, default: committer)
+	// Author overwrites the git author used for committing the files
+	// (optional, default: committer)
 	Author *Identity
-	// AuthorDate overwrites the git author date used for committing the files (optional, default: committer date)
+	// AuthorDate overwrites the git author date used for committing the files
+	// (optional, default: committer date)
 	AuthorDate *time.Time
 }
 
diff --git a/gitrpc/rpc/http.pb.go b/gitrpc/rpc/http.pb.go
index 9afe821bf..7006fe359 100644
--- a/gitrpc/rpc/http.pb.go
+++ b/gitrpc/rpc/http.pb.go
@@ -151,6 +151,7 @@ type ServicePackRequest struct {
 	// Depending on the service the matching base type has to be passed
 	//
 	// Types that are assignable to Base:
+	//
 	//	*ServicePackRequest_ReadBase
 	//	*ServicePackRequest_WriteBase
 	Base isServicePackRequest_Base `protobuf_oneof:"base"`
diff --git a/gitrpc/rpc/operations.pb.go b/gitrpc/rpc/operations.pb.go
index b526563df..269cec283 100644
--- a/gitrpc/rpc/operations.pb.go
+++ b/gitrpc/rpc/operations.pb.go
@@ -263,6 +263,7 @@ type CommitFilesAction struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Payload:
+	//
 	//	*CommitFilesAction_Header
 	//	*CommitFilesAction_Content
 	Payload isCommitFilesAction_Payload `protobuf_oneof:"payload"`
@@ -346,6 +347,7 @@ type CommitFilesRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Payload:
+	//
 	//	*CommitFilesRequest_Header
 	//	*CommitFilesRequest_Action
 	Payload isCommitFilesRequest_Payload `protobuf_oneof:"payload"`
diff --git a/gitrpc/rpc/ref.pb.go b/gitrpc/rpc/ref.pb.go
index 65fd62c44..431785951 100644
--- a/gitrpc/rpc/ref.pb.go
+++ b/gitrpc/rpc/ref.pb.go
@@ -118,19 +118,21 @@ func (ListCommitTagsRequest_SortOption) EnumDescriptor() ([]byte, []int) {
 	return file_ref_proto_rawDescGZIP(), []int{12, 0}
 }
 
-type CreateTagRequest struct {
+type CreateCommitTagRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Base    *WriteRequest `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
-	Sha     string        `protobuf:"bytes,2,opt,name=sha,proto3" json:"sha,omitempty"`
-	TagName string        `protobuf:"bytes,3,opt,name=tag_name,json=tagName,proto3" json:"tag_name,omitempty"`
-	Message string        `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"`
+	Base       *WriteRequest `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
+	TagName    string        `protobuf:"bytes,2,opt,name=tag_name,json=tagName,proto3" json:"tag_name,omitempty"`
+	Target     string        `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
+	Message    string        `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"`
+	Tagger     *Identity     `protobuf:"bytes,5,opt,name=tagger,proto3" json:"tagger,omitempty"`
+	TaggerDate int64         `protobuf:"varint,6,opt,name=taggerDate,proto3" json:"taggerDate,omitempty"`
 }
 
-func (x *CreateTagRequest) Reset() {
-	*x = CreateTagRequest{}
+func (x *CreateCommitTagRequest) Reset() {
+	*x = CreateCommitTagRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ref_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -138,13 +140,13 @@ func (x *CreateTagRequest) Reset() {
 	}
 }
 
-func (x *CreateTagRequest) String() string {
+func (x *CreateCommitTagRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CreateTagRequest) ProtoMessage() {}
+func (*CreateCommitTagRequest) ProtoMessage() {}
 
-func (x *CreateTagRequest) ProtoReflect() protoreflect.Message {
+func (x *CreateCommitTagRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_ref_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -156,40 +158,54 @@ func (x *CreateTagRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CreateTagRequest.ProtoReflect.Descriptor instead.
-func (*CreateTagRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateCommitTagRequest.ProtoReflect.Descriptor instead.
+func (*CreateCommitTagRequest) Descriptor() ([]byte, []int) {
 	return file_ref_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *CreateTagRequest) GetBase() *WriteRequest {
+func (x *CreateCommitTagRequest) GetBase() *WriteRequest {
 	if x != nil {
 		return x.Base
 	}
 	return nil
 }
 
-func (x *CreateTagRequest) GetSha() string {
-	if x != nil {
-		return x.Sha
-	}
-	return ""
-}
-
-func (x *CreateTagRequest) GetTagName() string {
+func (x *CreateCommitTagRequest) GetTagName() string {
 	if x != nil {
 		return x.TagName
 	}
 	return ""
 }
 
-func (x *CreateTagRequest) GetMessage() string {
+func (x *CreateCommitTagRequest) GetTarget() string {
+	if x != nil {
+		return x.Target
+	}
+	return ""
+}
+
+func (x *CreateCommitTagRequest) GetMessage() string {
 	if x != nil {
 		return x.Message
 	}
 	return ""
 }
 
-type CreateTagResponse struct {
+func (x *CreateCommitTagRequest) GetTagger() *Identity {
+	if x != nil {
+		return x.Tagger
+	}
+	return nil
+}
+
+func (x *CreateCommitTagRequest) GetTaggerDate() int64 {
+	if x != nil {
+		return x.TaggerDate
+	}
+	return 0
+}
+
+type CreateCommitTagResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -197,8 +213,8 @@ type CreateTagResponse struct {
 	Tag *CommitTag `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"`
 }
 
-func (x *CreateTagResponse) Reset() {
-	*x = CreateTagResponse{}
+func (x *CreateCommitTagResponse) Reset() {
+	*x = CreateCommitTagResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_ref_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -206,13 +222,13 @@ func (x *CreateTagResponse) Reset() {
 	}
 }
 
-func (x *CreateTagResponse) String() string {
+func (x *CreateCommitTagResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CreateTagResponse) ProtoMessage() {}
+func (*CreateCommitTagResponse) ProtoMessage() {}
 
-func (x *CreateTagResponse) ProtoReflect() protoreflect.Message {
+func (x *CreateCommitTagResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_ref_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -224,12 +240,12 @@ func (x *CreateTagResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CreateTagResponse.ProtoReflect.Descriptor instead.
-func (*CreateTagResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use CreateCommitTagResponse.ProtoReflect.Descriptor instead.
+func (*CreateCommitTagResponse) Descriptor() ([]byte, []int) {
 	return file_ref_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *CreateTagResponse) GetTag() *CommitTag {
+func (x *CreateCommitTagResponse) GetTag() *CommitTag {
 	if x != nil {
 		return x.Tag
 	}
@@ -1286,184 +1302,190 @@ var File_ref_proto protoreflect.FileDescriptor
 
 var file_ref_proto_rawDesc = []byte{
 	0x0a, 0x09, 0x72, 0x65, 0x66, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x72, 0x70, 0x63,
-	0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80,
-	0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68,
-	0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x12, 0x19, 0x0a, 0x08,
-	0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x74, 0x61, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x22, 0x35, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74,
-	0x54, 0x61, 0x67, 0x52, 0x03, 0x74, 0x61, 0x67, 0x22, 0x54, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04,
-	0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63,
-	0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62,
-	0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x75,
-	0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65,
+	0x1a, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd3,
+	0x01, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54,
+	0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x61, 0x73,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x72,
+	0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65,
+	0x12, 0x19, 0x0a, 0x08, 0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x0a,
+	0x06, 0x74, 0x61, 0x67, 0x67, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x74, 0x61,
+	0x67, 0x67, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x61, 0x67, 0x67, 0x65, 0x72, 0x44, 0x61,
+	0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x61, 0x67, 0x67, 0x65, 0x72,
+	0x44, 0x61, 0x74, 0x65, 0x22, 0x3b, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f,
+	0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x20, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x72,
+	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, 0x61,
+	0x67, 0x22, 0x54, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b,
-	0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a,
-	0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x3b, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42,
-	0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a,
-	0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x72, 0x70, 0x63, 0x2e, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x06, 0x62, 0x72, 0x61, 0x6e,
-	0x63, 0x68, 0x22, 0x59, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b,
-	0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a,
-	0x11, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52,
-	0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0x73, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08,
+	0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x74, 0x61, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x75, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74,
 	0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25,
 	0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72,
 	0x70, 0x63, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52,
 	0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f,
 	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x72, 0x61, 0x6e,
-	0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x28, 0x0a, 0x14,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x22, 0xb6, 0x02, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42,
-	0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24,
-	0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04,
-	0x62, 0x61, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e,
-	0x63, 0x6c, 0x75, 0x64, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71,
-	0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x12, 0x37, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x23, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68,
-	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x24, 0x0a, 0x05, 0x6f, 0x72,
-	0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e,
-	0x53, 0x6f, 0x72, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72,
-	0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
-	0x22, 0x2d, 0x0a, 0x0a, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b,
-	0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e,
-	0x61, 0x6d, 0x65, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x10, 0x02, 0x22,
-	0x3b, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63,
-	0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x72,
-	0x61, 0x6e, 0x63, 0x68, 0x52, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0x53, 0x0a, 0x06,
-	0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68,
-	0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x12, 0x23, 0x0a, 0x06,
-	0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69,
-	0x74, 0x22, 0xba, 0x02, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74,
-	0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x04, 0x62,
-	0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e,
-	0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73,
-	0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6d,
-	0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72,
-	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x39,
-	0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x24, 0x0a, 0x05, 0x6f, 0x72, 0x64,
-	0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53,
-	0x6f, 0x72, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12,
-	0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70,
-	0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22,
-	0x2d, 0x0a, 0x0a, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a,
-	0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x10, 0x02, 0x22, 0x3a,
-	0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
-	0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, 0x61, 0x67, 0x22, 0xd1, 0x01, 0x0a, 0x09, 0x43,
-	0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03,
-	0x73, 0x68, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x12, 0x21,
-	0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65,
-	0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x26, 0x0a, 0x06, 0x74, 0x61, 0x67, 0x67, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x52, 0x06, 0x74, 0x61, 0x67, 0x67, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x06, 0x63, 0x6f, 0x6d,
-	0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e,
-	0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, 0x79,
-	0x0a, 0x0d, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x3b,
+	0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x72, 0x61,
+	0x6e, 0x63, 0x68, 0x52, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0x59, 0x0a, 0x10, 0x47,
+	0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x24, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
 	0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52,
-	0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x66, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x27, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x07, 0x72, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x22, 0x22, 0x0a, 0x0e, 0x47, 0x65, 0x74,
-	0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73,
-	0x68, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x22, 0xb7, 0x01,
-	0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x66,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x66,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66,
-	0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x72, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a,
-	0x09, 0x6e, 0x65, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x6e, 0x65, 0x77, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x6c,
-	0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f,
-	0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xd3, 0x04, 0x0a,
-	0x10, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x43, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63,
-	0x68, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72,
-	0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x70,
-	0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61,
-	0x6e, 0x63, 0x68, 0x12, 0x15, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61,
-	0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70, 0x63,
-	0x2e, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x43, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e,
-	0x63, 0x68, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42,
-	0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x42,
-	0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x19, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e,
-	0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x4b,
-	0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73,
-	0x12, 0x1a, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69,
-	0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x3a, 0x0a, 0x09, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x15, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x54, 0x61, 0x67, 0x12, 0x15, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70,
-	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x12, 0x12, 0x2e,
-	0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x66, 0x12, 0x15, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x42, 0x27, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x69, 0x74, 0x6e, 0x65, 0x73, 0x73,
-	0x2f, 0x67, 0x69, 0x74, 0x72, 0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x72, 0x61, 0x6e,
+	0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61,
+	0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x62,
+	0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68,
+	0x22, 0x73, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x72, 0x69, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x1f,
+	0x0a, 0x0b, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
+	0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x28, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42,
+	0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a,
+	0x03, 0x73, 0x68, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x22,
+	0xb6, 0x02, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x25, 0x0a,
+	0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x43, 0x6f,
+	0x6d, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x37, 0x0a, 0x04, 0x73, 0x6f,
+	0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x73,
+	0x6f, 0x72, 0x74, 0x12, 0x24, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x72, 0x64,
+	0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x2d, 0x0a, 0x0a, 0x53, 0x6f, 0x72,
+	0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x01, 0x12, 0x08,
+	0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x10, 0x02, 0x22, 0x3b, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74,
+	0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x23, 0x0a, 0x06, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x06, 0x62,
+	0x72, 0x61, 0x6e, 0x63, 0x68, 0x22, 0x53, 0x0a, 0x06, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x73, 0x68, 0x61, 0x12, 0x23, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
+	0x69, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, 0xba, 0x02, 0x0a, 0x15, 0x4c,
+	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e,
+	0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69,
+	0x74, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x39, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74,
+	0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x73, 0x6f,
+	0x72, 0x74, 0x12, 0x24, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08,
+	0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x2d, 0x0a, 0x0a, 0x53, 0x6f, 0x72, 0x74,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x10, 0x01, 0x12, 0x08, 0x0a,
+	0x04, 0x44, 0x61, 0x74, 0x65, 0x10, 0x02, 0x22, 0x3a, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x43,
+	0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x20, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x03,
+	0x74, 0x61, 0x67, 0x22, 0xd1, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61,
+	0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68, 0x61, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x61, 0x6e,
+	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69,
+	0x73, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69,
+	0x74, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x74, 0x61,
+	0x67, 0x67, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x72, 0x70, 0x63,
+	0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x06, 0x74, 0x61, 0x67, 0x67,
+	0x65, 0x72, 0x12, 0x23, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52,
+	0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, 0x79, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x52, 0x65,
+	0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61,
+	0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x19,
+	0x0a, 0x08, 0x72, 0x65, 0x66, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x72, 0x65, 0x66, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x08, 0x72, 0x65, 0x66,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x52, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x72, 0x65, 0x66, 0x54, 0x79,
+	0x70, 0x65, 0x22, 0x22, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x68, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x73, 0x68, 0x61, 0x22, 0xb7, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x04, 0x62,
+	0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e,
+	0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x04, 0x62, 0x61,
+	0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x66, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a,
+	0x08, 0x72, 0x65, 0x66, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x0c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x72,
+	0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x5f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x6c, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x22, 0x13, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xe5, 0x04, 0x0a, 0x10, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x43, 0x0a, 0x0c, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x3a, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x15, 0x2e, 0x72,
+	0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x72, 0x61,
+	0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x0c, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x12, 0x18, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x45, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73,
+	0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63,
+	0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x70, 0x63,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x4b, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x43,
+	0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x12, 0x1a, 0x2e, 0x72, 0x70, 0x63, 0x2e,
+	0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74,
+	0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x30, 0x01, 0x12, 0x4c, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f,
+	0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x12, 0x1b, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12,
+	0x15, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31,
+	0x0a, 0x06, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x12, 0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x47,
+	0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72,
+	0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x3a, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x12, 0x15,
+	0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x27, 0x5a,
+	0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x72, 0x6e,
+	0x65, 0x73, 0x73, 0x2f, 0x67, 0x69, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x2f, 0x67, 0x69, 0x74, 0x72,
+	0x70, 0x63, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1483,8 +1505,8 @@ var file_ref_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
 var file_ref_proto_goTypes = []interface{}{
 	(ListBranchesRequest_SortOption)(0),   // 0: rpc.ListBranchesRequest.SortOption
 	(ListCommitTagsRequest_SortOption)(0), // 1: rpc.ListCommitTagsRequest.SortOption
-	(*CreateTagRequest)(nil),              // 2: rpc.CreateTagRequest
-	(*CreateTagResponse)(nil),             // 3: rpc.CreateTagResponse
+	(*CreateCommitTagRequest)(nil),        // 2: rpc.CreateCommitTagRequest
+	(*CreateCommitTagResponse)(nil),       // 3: rpc.CreateCommitTagResponse
 	(*DeleteTagRequest)(nil),              // 4: rpc.DeleteTagRequest
 	(*CreateBranchRequest)(nil),           // 5: rpc.CreateBranchRequest
 	(*CreateBranchResponse)(nil),          // 6: rpc.CreateBranchResponse
@@ -1503,59 +1525,61 @@ var file_ref_proto_goTypes = []interface{}{
 	(*UpdateRefRequest)(nil),              // 19: rpc.UpdateRefRequest
 	(*UpdateRefResponse)(nil),             // 20: rpc.UpdateRefResponse
 	(*WriteRequest)(nil),                  // 21: rpc.WriteRequest
-	(*ReadRequest)(nil),                   // 22: rpc.ReadRequest
-	(SortOrder)(0),                        // 23: rpc.SortOrder
-	(*Commit)(nil),                        // 24: rpc.Commit
-	(*Signature)(nil),                     // 25: rpc.Signature
-	(RefType)(0),                          // 26: rpc.RefType
+	(*Identity)(nil),                      // 22: rpc.Identity
+	(*ReadRequest)(nil),                   // 23: rpc.ReadRequest
+	(SortOrder)(0),                        // 24: rpc.SortOrder
+	(*Commit)(nil),                        // 25: rpc.Commit
+	(*Signature)(nil),                     // 26: rpc.Signature
+	(RefType)(0),                          // 27: rpc.RefType
 }
 var file_ref_proto_depIdxs = []int32{
-	21, // 0: rpc.CreateTagRequest.base:type_name -> rpc.WriteRequest
-	16, // 1: rpc.CreateTagResponse.tag:type_name -> rpc.CommitTag
-	21, // 2: rpc.DeleteTagRequest.base:type_name -> rpc.WriteRequest
-	21, // 3: rpc.CreateBranchRequest.base:type_name -> rpc.WriteRequest
-	13, // 4: rpc.CreateBranchResponse.branch:type_name -> rpc.Branch
-	22, // 5: rpc.GetBranchRequest.base:type_name -> rpc.ReadRequest
-	13, // 6: rpc.GetBranchResponse.branch:type_name -> rpc.Branch
-	21, // 7: rpc.DeleteBranchRequest.base:type_name -> rpc.WriteRequest
-	22, // 8: rpc.ListBranchesRequest.base:type_name -> rpc.ReadRequest
-	0,  // 9: rpc.ListBranchesRequest.sort:type_name -> rpc.ListBranchesRequest.SortOption
-	23, // 10: rpc.ListBranchesRequest.order:type_name -> rpc.SortOrder
-	13, // 11: rpc.ListBranchesResponse.branch:type_name -> rpc.Branch
-	24, // 12: rpc.Branch.commit:type_name -> rpc.Commit
-	22, // 13: rpc.ListCommitTagsRequest.base:type_name -> rpc.ReadRequest
-	1,  // 14: rpc.ListCommitTagsRequest.sort:type_name -> rpc.ListCommitTagsRequest.SortOption
-	23, // 15: rpc.ListCommitTagsRequest.order:type_name -> rpc.SortOrder
-	16, // 16: rpc.ListCommitTagsResponse.tag:type_name -> rpc.CommitTag
-	25, // 17: rpc.CommitTag.tagger:type_name -> rpc.Signature
-	24, // 18: rpc.CommitTag.commit:type_name -> rpc.Commit
-	22, // 19: rpc.GetRefRequest.base:type_name -> rpc.ReadRequest
-	26, // 20: rpc.GetRefRequest.ref_type:type_name -> rpc.RefType
-	21, // 21: rpc.UpdateRefRequest.base:type_name -> rpc.WriteRequest
-	26, // 22: rpc.UpdateRefRequest.ref_type:type_name -> rpc.RefType
-	5,  // 23: rpc.ReferenceService.CreateBranch:input_type -> rpc.CreateBranchRequest
-	7,  // 24: rpc.ReferenceService.GetBranch:input_type -> rpc.GetBranchRequest
-	9,  // 25: rpc.ReferenceService.DeleteBranch:input_type -> rpc.DeleteBranchRequest
-	11, // 26: rpc.ReferenceService.ListBranches:input_type -> rpc.ListBranchesRequest
-	14, // 27: rpc.ReferenceService.ListCommitTags:input_type -> rpc.ListCommitTagsRequest
-	2,  // 28: rpc.ReferenceService.CreateTag:input_type -> rpc.CreateTagRequest
-	4,  // 29: rpc.ReferenceService.DeleteTag:input_type -> rpc.DeleteTagRequest
-	17, // 30: rpc.ReferenceService.GetRef:input_type -> rpc.GetRefRequest
-	19, // 31: rpc.ReferenceService.UpdateRef:input_type -> rpc.UpdateRefRequest
-	6,  // 32: rpc.ReferenceService.CreateBranch:output_type -> rpc.CreateBranchResponse
-	8,  // 33: rpc.ReferenceService.GetBranch:output_type -> rpc.GetBranchResponse
-	10, // 34: rpc.ReferenceService.DeleteBranch:output_type -> rpc.DeleteBranchResponse
-	12, // 35: rpc.ReferenceService.ListBranches:output_type -> rpc.ListBranchesResponse
-	15, // 36: rpc.ReferenceService.ListCommitTags:output_type -> rpc.ListCommitTagsResponse
-	3,  // 37: rpc.ReferenceService.CreateTag:output_type -> rpc.CreateTagResponse
-	20, // 38: rpc.ReferenceService.DeleteTag:output_type -> rpc.UpdateRefResponse
-	18, // 39: rpc.ReferenceService.GetRef:output_type -> rpc.GetRefResponse
-	20, // 40: rpc.ReferenceService.UpdateRef:output_type -> rpc.UpdateRefResponse
-	32, // [32:41] is the sub-list for method output_type
-	23, // [23:32] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	21, // 0: rpc.CreateCommitTagRequest.base:type_name -> rpc.WriteRequest
+	22, // 1: rpc.CreateCommitTagRequest.tagger:type_name -> rpc.Identity
+	16, // 2: rpc.CreateCommitTagResponse.tag:type_name -> rpc.CommitTag
+	21, // 3: rpc.DeleteTagRequest.base:type_name -> rpc.WriteRequest
+	21, // 4: rpc.CreateBranchRequest.base:type_name -> rpc.WriteRequest
+	13, // 5: rpc.CreateBranchResponse.branch:type_name -> rpc.Branch
+	23, // 6: rpc.GetBranchRequest.base:type_name -> rpc.ReadRequest
+	13, // 7: rpc.GetBranchResponse.branch:type_name -> rpc.Branch
+	21, // 8: rpc.DeleteBranchRequest.base:type_name -> rpc.WriteRequest
+	23, // 9: rpc.ListBranchesRequest.base:type_name -> rpc.ReadRequest
+	0,  // 10: rpc.ListBranchesRequest.sort:type_name -> rpc.ListBranchesRequest.SortOption
+	24, // 11: rpc.ListBranchesRequest.order:type_name -> rpc.SortOrder
+	13, // 12: rpc.ListBranchesResponse.branch:type_name -> rpc.Branch
+	25, // 13: rpc.Branch.commit:type_name -> rpc.Commit
+	23, // 14: rpc.ListCommitTagsRequest.base:type_name -> rpc.ReadRequest
+	1,  // 15: rpc.ListCommitTagsRequest.sort:type_name -> rpc.ListCommitTagsRequest.SortOption
+	24, // 16: rpc.ListCommitTagsRequest.order:type_name -> rpc.SortOrder
+	16, // 17: rpc.ListCommitTagsResponse.tag:type_name -> rpc.CommitTag
+	26, // 18: rpc.CommitTag.tagger:type_name -> rpc.Signature
+	25, // 19: rpc.CommitTag.commit:type_name -> rpc.Commit
+	23, // 20: rpc.GetRefRequest.base:type_name -> rpc.ReadRequest
+	27, // 21: rpc.GetRefRequest.ref_type:type_name -> rpc.RefType
+	21, // 22: rpc.UpdateRefRequest.base:type_name -> rpc.WriteRequest
+	27, // 23: rpc.UpdateRefRequest.ref_type:type_name -> rpc.RefType
+	5,  // 24: rpc.ReferenceService.CreateBranch:input_type -> rpc.CreateBranchRequest
+	7,  // 25: rpc.ReferenceService.GetBranch:input_type -> rpc.GetBranchRequest
+	9,  // 26: rpc.ReferenceService.DeleteBranch:input_type -> rpc.DeleteBranchRequest
+	11, // 27: rpc.ReferenceService.ListBranches:input_type -> rpc.ListBranchesRequest
+	14, // 28: rpc.ReferenceService.ListCommitTags:input_type -> rpc.ListCommitTagsRequest
+	2,  // 29: rpc.ReferenceService.CreateCommitTag:input_type -> rpc.CreateCommitTagRequest
+	4,  // 30: rpc.ReferenceService.DeleteTag:input_type -> rpc.DeleteTagRequest
+	17, // 31: rpc.ReferenceService.GetRef:input_type -> rpc.GetRefRequest
+	19, // 32: rpc.ReferenceService.UpdateRef:input_type -> rpc.UpdateRefRequest
+	6,  // 33: rpc.ReferenceService.CreateBranch:output_type -> rpc.CreateBranchResponse
+	8,  // 34: rpc.ReferenceService.GetBranch:output_type -> rpc.GetBranchResponse
+	10, // 35: rpc.ReferenceService.DeleteBranch:output_type -> rpc.DeleteBranchResponse
+	12, // 36: rpc.ReferenceService.ListBranches:output_type -> rpc.ListBranchesResponse
+	15, // 37: rpc.ReferenceService.ListCommitTags:output_type -> rpc.ListCommitTagsResponse
+	3,  // 38: rpc.ReferenceService.CreateCommitTag:output_type -> rpc.CreateCommitTagResponse
+	20, // 39: rpc.ReferenceService.DeleteTag:output_type -> rpc.UpdateRefResponse
+	18, // 40: rpc.ReferenceService.GetRef:output_type -> rpc.GetRefResponse
+	20, // 41: rpc.ReferenceService.UpdateRef:output_type -> rpc.UpdateRefResponse
+	33, // [33:42] is the sub-list for method output_type
+	24, // [24:33] is the sub-list for method input_type
+	24, // [24:24] is the sub-list for extension type_name
+	24, // [24:24] is the sub-list for extension extendee
+	0,  // [0:24] is the sub-list for field type_name
 }
 
 func init() { file_ref_proto_init() }
@@ -1566,7 +1590,7 @@ func file_ref_proto_init() {
 	file_shared_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_ref_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateTagRequest); i {
+			switch v := v.(*CreateCommitTagRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1578,7 +1602,7 @@ func file_ref_proto_init() {
 			}
 		}
 		file_ref_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateTagResponse); i {
+			switch v := v.(*CreateCommitTagResponse); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/gitrpc/rpc/ref_grpc.pb.go b/gitrpc/rpc/ref_grpc.pb.go
index 1056d1a5f..ea826ae40 100644
--- a/gitrpc/rpc/ref_grpc.pb.go
+++ b/gitrpc/rpc/ref_grpc.pb.go
@@ -27,7 +27,7 @@ type ReferenceServiceClient interface {
 	DeleteBranch(ctx context.Context, in *DeleteBranchRequest, opts ...grpc.CallOption) (*DeleteBranchResponse, error)
 	ListBranches(ctx context.Context, in *ListBranchesRequest, opts ...grpc.CallOption) (ReferenceService_ListBranchesClient, error)
 	ListCommitTags(ctx context.Context, in *ListCommitTagsRequest, opts ...grpc.CallOption) (ReferenceService_ListCommitTagsClient, error)
-	CreateTag(ctx context.Context, in *CreateTagRequest, opts ...grpc.CallOption) (*CreateTagResponse, error)
+	CreateCommitTag(ctx context.Context, in *CreateCommitTagRequest, opts ...grpc.CallOption) (*CreateCommitTagResponse, error)
 	DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*UpdateRefResponse, error)
 	GetRef(ctx context.Context, in *GetRefRequest, opts ...grpc.CallOption) (*GetRefResponse, error)
 	UpdateRef(ctx context.Context, in *UpdateRefRequest, opts ...grpc.CallOption) (*UpdateRefResponse, error)
@@ -132,9 +132,9 @@ func (x *referenceServiceListCommitTagsClient) Recv() (*ListCommitTagsResponse,
 	return m, nil
 }
 
-func (c *referenceServiceClient) CreateTag(ctx context.Context, in *CreateTagRequest, opts ...grpc.CallOption) (*CreateTagResponse, error) {
-	out := new(CreateTagResponse)
-	err := c.cc.Invoke(ctx, "/rpc.ReferenceService/CreateTag", in, out, opts...)
+func (c *referenceServiceClient) CreateCommitTag(ctx context.Context, in *CreateCommitTagRequest, opts ...grpc.CallOption) (*CreateCommitTagResponse, error) {
+	out := new(CreateCommitTagResponse)
+	err := c.cc.Invoke(ctx, "/rpc.ReferenceService/CreateCommitTag", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -177,7 +177,7 @@ type ReferenceServiceServer interface {
 	DeleteBranch(context.Context, *DeleteBranchRequest) (*DeleteBranchResponse, error)
 	ListBranches(*ListBranchesRequest, ReferenceService_ListBranchesServer) error
 	ListCommitTags(*ListCommitTagsRequest, ReferenceService_ListCommitTagsServer) error
-	CreateTag(context.Context, *CreateTagRequest) (*CreateTagResponse, error)
+	CreateCommitTag(context.Context, *CreateCommitTagRequest) (*CreateCommitTagResponse, error)
 	DeleteTag(context.Context, *DeleteTagRequest) (*UpdateRefResponse, error)
 	GetRef(context.Context, *GetRefRequest) (*GetRefResponse, error)
 	UpdateRef(context.Context, *UpdateRefRequest) (*UpdateRefResponse, error)
@@ -203,8 +203,8 @@ func (UnimplementedReferenceServiceServer) ListBranches(*ListBranchesRequest, Re
 func (UnimplementedReferenceServiceServer) ListCommitTags(*ListCommitTagsRequest, ReferenceService_ListCommitTagsServer) error {
 	return status.Errorf(codes.Unimplemented, "method ListCommitTags not implemented")
 }
-func (UnimplementedReferenceServiceServer) CreateTag(context.Context, *CreateTagRequest) (*CreateTagResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CreateTag not implemented")
+func (UnimplementedReferenceServiceServer) CreateCommitTag(context.Context, *CreateCommitTagRequest) (*CreateCommitTagResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateCommitTag not implemented")
 }
 func (UnimplementedReferenceServiceServer) DeleteTag(context.Context, *DeleteTagRequest) (*UpdateRefResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTag not implemented")
@@ -324,20 +324,20 @@ func (x *referenceServiceListCommitTagsServer) Send(m *ListCommitTagsResponse) e
 	return x.ServerStream.SendMsg(m)
 }
 
-func _ReferenceService_CreateTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateTagRequest)
+func _ReferenceService_CreateCommitTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateCommitTagRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(ReferenceServiceServer).CreateTag(ctx, in)
+		return srv.(ReferenceServiceServer).CreateCommitTag(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/rpc.ReferenceService/CreateTag",
+		FullMethod: "/rpc.ReferenceService/CreateCommitTag",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ReferenceServiceServer).CreateTag(ctx, req.(*CreateTagRequest))
+		return srv.(ReferenceServiceServer).CreateCommitTag(ctx, req.(*CreateCommitTagRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -416,8 +416,8 @@ var ReferenceService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _ReferenceService_DeleteBranch_Handler,
 		},
 		{
-			MethodName: "CreateTag",
-			Handler:    _ReferenceService_CreateTag_Handler,
+			MethodName: "CreateCommitTag",
+			Handler:    _ReferenceService_CreateCommitTag_Handler,
 		},
 		{
 			MethodName: "DeleteTag",
diff --git a/gitrpc/rpc/repo.pb.go b/gitrpc/rpc/repo.pb.go
index 22a1c8932..5c9f42d3e 100644
--- a/gitrpc/rpc/repo.pb.go
+++ b/gitrpc/rpc/repo.pb.go
@@ -216,6 +216,7 @@ type CreateRepositoryRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Data:
+	//
 	//	*CreateRepositoryRequest_Header
 	//	*CreateRepositoryRequest_File
 	Data isCreateRepositoryRequest_Data `protobuf_oneof:"data"`
@@ -1162,6 +1163,7 @@ type GetBlobResponse struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Data:
+	//
 	//	*GetBlobResponse_Header
 	//	*GetBlobResponse_Content
 	Data isGetBlobResponse_Data `protobuf_oneof:"data"`
diff --git a/gitrpc/rpc/shared.pb.go b/gitrpc/rpc/shared.pb.go
index 084d3dfb6..65817ec5b 100644
--- a/gitrpc/rpc/shared.pb.go
+++ b/gitrpc/rpc/shared.pb.go
@@ -298,6 +298,7 @@ type FileUpload struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Data:
+	//
 	//	*FileUpload_Header
 	//	*FileUpload_Chunk
 	Data isFileUpload_Data `protobuf_oneof:"data"`
diff --git a/gitrpc/server/config.go b/gitrpc/server/config.go
index 364d1100b..46ecedf6a 100644
--- a/gitrpc/server/config.go
+++ b/gitrpc/server/config.go
@@ -6,6 +6,7 @@ package server
 
 import (
 	"errors"
+	"time"
 )
 
 // Config represents the configuration for the gitrpc server.
@@ -22,6 +23,8 @@ type Config struct {
 	HTTP struct {
 		Bind string `envconfig:"GITRPC_SERVER_HTTP_BIND" default:":4001"`
 	}
+	MaxConnAge      time.Duration `envconfig:"GITRPC_SERVER_MAX_CONN_AGE" default:"630720000s"`
+	MaxConnAgeGrace time.Duration `envconfig:"GITRPC_SERVER_MAX_CONN_AGE_GRACE" default:"630720000s"`
 }
 
 func (c *Config) Validate() error {
@@ -37,6 +40,12 @@ func (c *Config) Validate() error {
 	if c.GitHookPath == "" {
 		return errors.New("config.GitHookPath is required")
 	}
+	if c.MaxConnAge == 0 {
+		return errors.New("config.MaxConnAge is required")
+	}
+	if c.MaxConnAgeGrace == 0 {
+		return errors.New("config.MaxConnAgeGrace is required")
+	}
 
 	return nil
 }
diff --git a/gitrpc/server/server.go b/gitrpc/server/server.go
index 60318ea53..b24378c57 100644
--- a/gitrpc/server/server.go
+++ b/gitrpc/server/server.go
@@ -19,6 +19,7 @@ import (
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
 )
 
 const (
@@ -58,6 +59,10 @@ func NewServer(config Config, adapter service.GitAdapter) (*GRPCServer, error) {
 			logIntc.StreamInterceptor(),
 			errIntc.StreamInterceptor(),
 		)),
+		grpc.KeepaliveParams(keepalive.ServerParameters{
+			MaxConnectionAge:      config.MaxConnAge,
+			MaxConnectionAgeGrace: config.MaxConnAgeGrace,
+		}),
 	)
 	store := storage.NewLocalStore()
 	// create a temp dir for deleted repositories
diff --git a/gitrpc/tag.go b/gitrpc/tag.go
index 738419f4b..b971d6e64 100644
--- a/gitrpc/tag.go
+++ b/gitrpc/tag.go
@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"time"
 
 	"github.com/harness/gitness/gitrpc/rpc"
 
@@ -47,14 +48,26 @@ type CommitTag struct {
 	Commit      *Commit
 }
 
-type CreateTagParams struct {
+type CreateCommitTagParams struct {
 	WriteParams
-	Name    string
-	SHA     string
+	Name string
+
+	// Target is the commit (or points to the commit) the new tag will be pointing to.
+	Target string
+
+	// Message is the optional message the tag will be created with - if the message is empty
+	// the tag will be lightweight, otherwise it'll be annotated
 	Message string
+
+	// Tagger overwrites the git author used in case the tag is annotated
+	// (optional, default: actor)
+	Tagger *Identity
+	// TaggerDate overwrites the git author date used in case the tag is annotated
+	// (optional, default: current time on server)
+	TaggerDate *time.Time
 }
 
-func (p *CreateTagParams) Validate() error {
+func (p *CreateCommitTagParams) Validate() error {
 	if p == nil {
 		return ErrNoParamsProvided
 	}
@@ -62,16 +75,14 @@ func (p *CreateTagParams) Validate() error {
 	if p.Name == "" {
 		return errors.New("tag name cannot be empty")
 	}
-	if p.SHA == "" {
+	if p.Target == "" {
 		return errors.New("target cannot be empty")
 	}
-	if p.Message == "" {
-		return errors.New("message cannot be empty")
-	}
+
 	return nil
 }
 
-type CreateTagOutput struct {
+type CreateCommitTagOutput struct {
 	CommitTag
 }
 
@@ -139,18 +150,20 @@ func (c *Client) ListCommitTags(ctx context.Context, params *ListCommitTagsParam
 
 	return output, nil
 }
-func (c *Client) CreateTag(ctx context.Context, params *CreateTagParams) (*CreateTagOutput, error) {
+func (c *Client) CreateCommitTag(ctx context.Context, params *CreateCommitTagParams) (*CreateCommitTagOutput, error) {
 	err := params.Validate()
 
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := c.refService.CreateTag(ctx, &rpc.CreateTagRequest{
-		Base:    mapToRPCWriteRequest(params.WriteParams),
-		Sha:     params.SHA,
-		TagName: params.Name,
-		Message: params.Message,
+	resp, err := c.refService.CreateCommitTag(ctx, &rpc.CreateCommitTagRequest{
+		Base:       mapToRPCWriteRequest(params.WriteParams),
+		Target:     params.Target,
+		TagName:    params.Name,
+		Message:    params.Message,
+		Tagger:     mapToRPCIdentityOptional(params.Tagger),
+		TaggerDate: mapToRPCTimeOptional(params.TaggerDate),
 	})
 
 	if err != nil {
@@ -163,7 +176,7 @@ func (c *Client) CreateTag(ctx context.Context, params *CreateTagParams) (*Creat
 		return nil, fmt.Errorf("failed to map rpc tag: %w", err)
 	}
 
-	return &CreateTagOutput{
+	return &CreateCommitTagOutput{
 		CommitTag: *commitTag,
 	}, nil
 }
diff --git a/go.mod b/go.mod
index 191b37f29..32ed581a0 100644
--- a/go.mod
+++ b/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.0
 	github.com/rs/xid v1.4.0
 	github.com/rs/zerolog v1.29.0
+	github.com/sercand/kuberesolver/v5 v5.1.0
 	github.com/stretchr/testify v1.8.1
 	github.com/swaggest/openapi-go v0.2.23
 	github.com/swaggest/swgui v1.4.2
@@ -44,23 +45,30 @@ require (
 	golang.org/x/crypto v0.1.0
 	golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a
 	golang.org/x/sync v0.1.0
-	golang.org/x/term v0.2.0
-	golang.org/x/text v0.4.0
-	google.golang.org/grpc v1.50.1
-	google.golang.org/protobuf v1.28.1
+	golang.org/x/term v0.6.0
+	golang.org/x/text v0.8.0
+	google.golang.org/grpc v1.55.0
+	google.golang.org/protobuf v1.30.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )
 
 require (
-	cloud.google.com/go v0.105.0 // indirect
-	cloud.google.com/go/compute v1.12.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.1 // indirect
+	cloud.google.com/go v0.110.0 // indirect
+	cloud.google.com/go/compute v1.18.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	google.golang.org/api v0.102.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/oauth2 v0.6.0 // indirect
+	google.golang.org/api v0.110.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
 
@@ -77,8 +85,8 @@ require (
 	github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/djherbis/buffer v1.2.0 // indirect
@@ -91,7 +99,7 @@ require (
 	github.com/go-git/go-git/v5 v5.4.3-0.20210630082519-b4368b2a2ca4 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c // indirect
 	github.com/google/subcommands v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -115,11 +123,11 @@ require (
 	github.com/xanzy/ssh-agent v0.3.1 // indirect
 	github.com/yuin/goldmark v1.4.13 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/net v0.2.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
+	golang.org/x/tools v0.6.0 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index a85ef5e3c..2700ba03a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,16 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
-cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
-cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0=
-cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48=
-cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
+cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
+cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
+cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY=
+cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
+cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
+cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
+cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE=
+cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/profiler v0.3.1 h1:b5got9Be9Ia0HVvyt7PavWxXEht15B9lWnigdvHtxOc=
 cloud.google.com/go/profiler v0.3.1/go.mod h1:GsG14VnmcMFQ9b+kq71wh3EKMZr3WRMgLzNiFRpW7tE=
+cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI=
 code.gitea.io/gitea v1.17.2 h1:NRcVr07jF+za4d0NZZlJXeCuQK5FfHMtjPDjq4u3UiY=
 code.gitea.io/gitea v1.17.2/go.mod h1:sovminOoSsc8IC2T29rX9+MmaboHTu8QDEvJjaSqIXg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -20,7 +23,6 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX
 github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 h1:cSHEbLj0GZeHM1mWG84qEnGFojNEQ83W7cwaPRjcwXU=
 github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
@@ -37,13 +39,12 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 h1:AUNCr9CiJuwrRYS3XieqF+Z9B9gNxo/eANAJCF2eiN4=
-github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -57,6 +58,7 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bool64/dev v0.1.41/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
@@ -66,22 +68,16 @@ github.com/bool64/shared v0.1.5 h1:fp3eUhBsrSjNCQPcSdQqZxxh9bBwrYiZ+zOKFkM0/2E=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
@@ -124,9 +120,6 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -134,7 +127,8 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/gliderlabs/ssh v0.3.4 h1:+AXBtim7MTKaLVPgvE+3mhewYRawNLTd+jEEz/wExZw=
@@ -212,6 +206,7 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -221,8 +216,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k=
 github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
@@ -236,14 +232,11 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3 h1:vFrXU7L2gqtlP/ZGijSpaDIc16ZQrZI4FAuYtpQTyQc=
-github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3/go.mod h1:Pt31oes+eGImORns3McJn8zHefuQl2rG8l6xQjGYB4U=
 github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c h1:lvddKcYTQ545ADhBujtIJmqQrZBDsGo7XIMbAQe/sNY=
 github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
@@ -251,10 +244,11 @@ github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TU
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
 github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
-github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
+github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
 github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -269,7 +263,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaW
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/guregu/null v4.0.0+incompatible h1:4zw0ckM7ECd6FNNddc3Fu4aty9nTlpkkzH7dPn4/4Gw=
 github.com/guregu/null v4.0.0+incompatible/go.mod h1:ePGpQaN9cw0tj45IR5E5ehMvsFlLlQZAkkOXZurJ3NM=
 github.com/harness/go-rbac v0.0.0-20230409233212-ca97fe90aac8 h1:sQzaA/ithB9mCXTC5VeC4XTWmQ531Tefbgxr1X4y7WU=
@@ -397,7 +390,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -450,6 +443,8 @@ github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -527,23 +522,30 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
 github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -558,6 +560,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sercand/kuberesolver/v5 v5.1.0 h1:YLqreB1vUFbZHSidcqI5ChMp+RIRmop0brQOeUFWiRw=
+github.com/sercand/kuberesolver/v5 v5.1.0/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -576,7 +580,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -636,9 +639,8 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -690,8 +692,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -711,7 +713,6 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -723,13 +724,12 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
-golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
+golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -789,22 +789,22 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -830,17 +830,18 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.102.0 h1:JxJl2qQ85fRMPNvlZY/enexbxpCjLwGhZUtgfGeQ51I=
-google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
+google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU=
+google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -852,12 +853,9 @@ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
@@ -870,14 +868,9 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY=
-google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
+google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -889,10 +882,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -916,7 +908,6 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go
index d19e8dce1..499164c04 100644
--- a/internal/api/auth/auth.go
+++ b/internal/api/auth/auth.go
@@ -25,13 +25,12 @@ var (
 	ErrParentResourceTypeUnknown = errors.New("Unknown parent resource type")
 )
 
-/*
- * Check checks if a resource specific permission is granted for the current auth session in the scope.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// Check checks if a resource specific permission is granted for the current auth session in the scope.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func Check(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
-	scope *types.Scope, resource *types.Resource, permission enum.Permission) error {
+	scope *types.Scope, resource *types.Resource, permission enum.Permission,
+) error {
 	if session == nil {
 		return ErrNotAuthenticated
 	}
@@ -53,12 +52,10 @@ func Check(ctx context.Context, authorizer authz.Authorizer, session *auth.Sessi
 	return nil
 }
 
-/*
- * CheckChild checks if a resource specific permission is granted for the current auth session
- * in the scope of a parent.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckChild checks if a resource specific permission is granted for the current auth session
+// in the scope of a parent.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckChild(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
 	spaceStore store.SpaceStore, repoStore store.RepoStore, parentType enum.ParentResourceType, parentID int64,
 	resourceType enum.ResourceType, resourceName string, permission enum.Permission) error {
diff --git a/internal/api/auth/repo.go b/internal/api/auth/repo.go
index ddf0a8b8d..67b8c454b 100644
--- a/internal/api/auth/repo.go
+++ b/internal/api/auth/repo.go
@@ -16,14 +16,13 @@ import (
 	"github.com/pkg/errors"
 )
 
-/*
- * CheckRepo checks if a repo specific permission is granted for the current auth session
- * in the scope of its parent.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckRepo checks if a repo specific permission is granted for the current auth session
+// in the scope of its parent.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckRepo(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
-	repo *types.Repository, permission enum.Permission, orPublic bool) error {
+	repo *types.Repository, permission enum.Permission, orPublic bool,
+) error {
 	if orPublic && repo.IsPublic {
 		return nil
 	}
diff --git a/internal/api/auth/service.go b/internal/api/auth/service.go
index 03673bcc3..acc21fc24 100644
--- a/internal/api/auth/service.go
+++ b/internal/api/auth/service.go
@@ -13,14 +13,13 @@ import (
 	"github.com/harness/gitness/types/enum"
 )
 
-/*
- * CheckService checks if a service specific permission is granted for the current auth session.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckService checks if a service specific permission is granted for the current auth session.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckService(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
-	svc *types.Service, permission enum.Permission) error {
-	// a service exists outside of any scope
+	svc *types.Service, permission enum.Permission,
+) error {
+	// a service exists outside any scope
 	scope := &types.Scope{}
 	resource := &types.Resource{
 		Type: enum.ResourceTypeService,
diff --git a/internal/api/auth/serviceAccount.go b/internal/api/auth/service_account.go
similarity index 66%
rename from internal/api/auth/serviceAccount.go
rename to internal/api/auth/service_account.go
index 7a9c65a3b..332e79bc2 100644
--- a/internal/api/auth/serviceAccount.go
+++ b/internal/api/auth/service_account.go
@@ -13,15 +13,15 @@ import (
 	"github.com/harness/gitness/types/enum"
 )
 
-/*
- * CheckServiceAccount checks if a service account specific permission is granted for the current auth session
- * in the scope of the parent.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckServiceAccount checks if a service account specific permission is granted for the current auth session
+// in the scope of the parent.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckServiceAccount(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
 	spaceStore store.SpaceStore, repoStore store.RepoStore, parentType enum.ParentResourceType, parentID int64,
-	saUID string, permission enum.Permission) error {
-	return CheckChild(ctx, authorizer, session, spaceStore, repoStore, parentType, parentID,
+	saUID string, permission enum.Permission,
+) error {
+	return CheckChild(ctx, authorizer, session,
+		spaceStore, repoStore, parentType, parentID,
 		enum.ResourceTypeServiceAccount, saUID, permission)
 }
diff --git a/internal/api/auth/space.go b/internal/api/auth/space.go
index 78e46bded..68c28ebe3 100644
--- a/internal/api/auth/space.go
+++ b/internal/api/auth/space.go
@@ -16,14 +16,13 @@ import (
 	"github.com/pkg/errors"
 )
 
-/*
- * CheckSpace checks if a space specific permission is granted for the current auth session
- * in the scope of its parent.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckSpace checks if a space specific permission is granted for the current auth session
+// in the scope of its parent.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckSpace(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
-	space *types.Space, permission enum.Permission, orPublic bool) error {
+	space *types.Space, permission enum.Permission, orPublic bool,
+) error {
 	if orPublic && space.IsPublic {
 		return nil
 	}
diff --git a/internal/api/auth/user.go b/internal/api/auth/user.go
index c0f766d51..d795eb5e3 100644
--- a/internal/api/auth/user.go
+++ b/internal/api/auth/user.go
@@ -13,14 +13,13 @@ import (
 	"github.com/harness/gitness/types/enum"
 )
 
-/*
- * CheckUser checks if a user specific permission is granted for the current auth session.
- * Returns nil if the permission is granted, otherwise returns an error.
- * NotAuthenticated, NotAuthorized, or any unerlaying error.
- */
+// CheckUser checks if a user specific permission is granted for the current auth session.
+// Returns nil if the permission is granted, otherwise returns an error.
+// NotAuthenticated, NotAuthorized, or any underlying error.
 func CheckUser(ctx context.Context, authorizer authz.Authorizer, session *auth.Session,
-	user *types.User, permission enum.Permission) error {
-	// a user exists outside of any scope
+	user *types.User, permission enum.Permission,
+) error {
+	// a user exists outside any scope
 	scope := &types.Scope{}
 	resource := &types.Resource{
 		Type: enum.ResourceTypeUser,
diff --git a/internal/api/controller/check/controller.go b/internal/api/controller/check/controller.go
index 3c866f170..3c3055156 100644
--- a/internal/api/controller/check/controller.go
+++ b/internal/api/controller/check/controller.go
@@ -23,8 +23,8 @@ import (
 type Controller struct {
 	db           *sqlx.DB
 	authorizer   authz.Authorizer
-	checkStore   store.CheckStore
 	repoStore    store.RepoStore
+	checkStore   store.CheckStore
 	gitRPCClient gitrpc.Interface
 }
 
@@ -32,12 +32,14 @@ func NewController(
 	db *sqlx.DB,
 	authorizer authz.Authorizer,
 	repoStore store.RepoStore,
+	checkStore store.CheckStore,
 	gitRPCClient gitrpc.Interface,
 ) *Controller {
 	return &Controller{
 		db:           db,
 		authorizer:   authorizer,
 		repoStore:    repoStore,
+		checkStore:   checkStore,
 		gitRPCClient: gitRPCClient,
 	}
 }
diff --git a/internal/api/controller/check/wire.go b/internal/api/controller/check/wire.go
index dacda81a2..6a15eef0c 100644
--- a/internal/api/controller/check/wire.go
+++ b/internal/api/controller/check/wire.go
@@ -18,11 +18,18 @@ var WireSet = wire.NewSet(
 	ProvideController,
 )
 
-func ProvideController(db *sqlx.DB, authorizer authz.Authorizer,
+func ProvideController(
+	db *sqlx.DB,
+	authorizer authz.Authorizer,
 	repoStore store.RepoStore,
+	checkStore store.CheckStore,
 	rpcClient gitrpc.Interface,
 ) *Controller {
-	return NewController(db, authorizer,
+	return NewController(
+		db,
+		authorizer,
 		repoStore,
-		rpcClient)
+		checkStore,
+		rpcClient,
+	)
 }
diff --git a/internal/api/controller/pullreq/merge.go b/internal/api/controller/pullreq/merge.go
index 219e599b8..269309757 100644
--- a/internal/api/controller/pullreq/merge.go
+++ b/internal/api/controller/pullreq/merge.go
@@ -83,12 +83,6 @@ func (c *Controller) Merge(
 		return types.MergeResponse{}, usererror.BadRequest("Pull request must be open")
 	}
 
-	if pr.UnresolvedCount > 0 {
-		return types.MergeResponse{}, usererror.BadRequest(
-			"Pull requests with unresolved comments can't be merged. Resolve all the comments first.",
-		)
-	}
-
 	if pr.IsDraft {
 		return types.MergeResponse{}, usererror.BadRequest(
 			"Draft pull requests can't be merged. Clear the draft flag first.",
diff --git a/internal/api/controller/pullreq/pr_diff.go b/internal/api/controller/pullreq/pr_diff.go
deleted file mode 100644
index bab0d403b..000000000
--- a/internal/api/controller/pullreq/pr_diff.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2022 Harness Inc. All rights reserved.
-// Use of this source code is governed by the Polyform Free Trial License
-// that can be found in the LICENSE.md file for this repository.
-
-package pullreq
-
-import (
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/harness/gitness/gitrpc"
-	"github.com/harness/gitness/internal/auth"
-	"github.com/harness/gitness/types/enum"
-)
-
-// RawDiff writes raw git diff to writer w.
-func (c *Controller) RawDiff(
-	ctx context.Context,
-	session *auth.Session,
-	repoRef string,
-	pullreqNum int64,
-	setSHAs func(sourceSHA, mergeBaseSHA string),
-	w io.Writer,
-) error {
-	repo, err := c.getRepoCheckAccess(ctx, session, repoRef, enum.PermissionRepoView)
-	if err != nil {
-		return fmt.Errorf("failed to acquire access to target repo: %w", err)
-	}
-
-	pr, err := c.pullreqStore.FindByNumber(ctx, repo.ID, pullreqNum)
-	if err != nil {
-		return fmt.Errorf("failed to get pull request by number: %w", err)
-	}
-
-	headRef := pr.SourceSHA
-	baseRef := pr.MergeBaseSHA
-
-	setSHAs(headRef, baseRef)
-
-	return c.gitRPCClient.RawDiff(ctx, &gitrpc.DiffParams{
-		ReadParams: gitrpc.CreateRPCReadParams(repo),
-		BaseRef:    baseRef,
-		HeadRef:    headRef,
-		MergeBase:  true,
-	}, w)
-}
diff --git a/internal/api/controller/repo/create.go b/internal/api/controller/repo/create.go
index 0175b9c80..c7f7a60cf 100644
--- a/internal/api/controller/repo/create.go
+++ b/internal/api/controller/repo/create.go
@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -34,7 +35,7 @@ var (
 )
 
 type CreateInput struct {
-	ParentID      int64  `json:"parent_id"`
+	ParentRef     string `json:"parent_ref"`
 	UID           string `json:"uid"`
 	DefaultBranch string `json:"default_branch"`
 	Description   string `json:"description"`
@@ -47,7 +48,8 @@ type CreateInput struct {
 
 // Create creates a new repository.
 func (c *Controller) Create(ctx context.Context, session *auth.Session, in *CreateInput) (*types.Repository, error) {
-	if err := c.checkAuthRepoCreation(ctx, session, in.ParentID); err != nil {
+	parentSpace, err := c.getSpaceCheckAuthRepoCreation(ctx, session, in.ParentRef)
+	if err != nil {
 		return nil, err
 	}
 
@@ -64,7 +66,7 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 	err = dbtx.New(c.db).WithTx(ctx, func(ctx context.Context) error {
 		// lock parent space path to ensure it doesn't get updated while we setup new repo
 		var spacePath *types.Path
-		spacePath, err = c.pathStore.FindPrimaryWithLock(ctx, enum.PathTargetTypeSpace, in.ParentID)
+		spacePath, err = c.pathStore.FindPrimaryWithLock(ctx, enum.PathTargetTypeSpace, parentSpace.ID)
 		if err != nil {
 			return usererror.BadRequest("Parent not found'")
 		}
@@ -72,7 +74,7 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 		now := time.Now().UnixMilli()
 		repo = &types.Repository{
 			Version:       0,
-			ParentID:      in.ParentID,
+			ParentID:      parentSpace.ID,
 			UID:           in.UID,
 			GitUID:        gitRPCResp.UID,
 			Path:          paths.Concatinate(spacePath.Value, in.UID),
@@ -123,10 +125,14 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 	return repo, nil
 }
 
-func (c *Controller) checkAuthRepoCreation(ctx context.Context, session *auth.Session, parentID int64) error {
-	space, err := c.spaceStore.Find(ctx, parentID)
+func (c *Controller) getSpaceCheckAuthRepoCreation(
+	ctx context.Context,
+	session *auth.Session,
+	parentRef string,
+) (*types.Space, error) {
+	space, err := c.spaceStore.FindByRef(ctx, parentRef)
 	if err != nil {
-		return fmt.Errorf("parent space not found: %w", err)
+		return nil, fmt.Errorf("parent space not found: %w", err)
 	}
 
 	// create is a special case - check permission without specific resource
@@ -138,14 +144,16 @@ func (c *Controller) checkAuthRepoCreation(ctx context.Context, session *auth.Se
 
 	err = apiauth.Check(ctx, c.authorizer, session, scope, resource, enum.PermissionRepoEdit)
 	if err != nil {
-		return fmt.Errorf("auth check failed: %w", err)
+		return nil, fmt.Errorf("auth check failed: %w", err)
 	}
 
-	return nil
+	return space, nil
 }
 
 func (c *Controller) sanitizeCreateInput(in *CreateInput) error {
-	if in.ParentID <= 0 {
+	parentRefAsID, err := strconv.ParseInt(in.ParentRef, 10, 64)
+
+	if (err == nil && parentRefAsID <= 0) || (len(strings.TrimSpace(in.ParentRef)) == 0) {
 		return errRepositoryRequiresParent
 	}
 
diff --git a/internal/api/controller/repo/create_branch.go b/internal/api/controller/repo/create_branch.go
index 9e335f7b1..0bc01ae45 100644
--- a/internal/api/controller/repo/create_branch.go
+++ b/internal/api/controller/repo/create_branch.go
@@ -22,7 +22,7 @@ type CreateBranchInput struct {
 
 	// Target is the commit (or points to the commit) the new branch will be pointing to.
 	// If no target is provided, the branch points to the same commit as the default branch of the repo.
-	Target *string `json:"target"`
+	Target string `json:"target"`
 }
 
 // CreateBranch creates a new branch for a repo.
@@ -38,8 +38,8 @@ func (c *Controller) CreateBranch(ctx context.Context, session *auth.Session,
 	}
 
 	// set target to default branch in case no target was provided
-	if in.Target == nil || *in.Target == "" {
-		in.Target = &repo.DefaultBranch
+	if in.Target == "" {
+		in.Target = repo.DefaultBranch
 	}
 
 	err = checkBranchName(in.Name)
@@ -55,7 +55,7 @@ func (c *Controller) CreateBranch(ctx context.Context, session *auth.Session,
 	rpcOut, err := c.gitRPCClient.CreateBranch(ctx, &gitrpc.CreateBranchParams{
 		WriteParams: writeParams,
 		BranchName:  in.Name,
-		Target:      *in.Target,
+		Target:      in.Target,
 	})
 	if err != nil {
 		return nil, err
diff --git a/internal/api/controller/repo/create_tag.go b/internal/api/controller/repo/create_commit_tag.go
similarity index 54%
rename from internal/api/controller/repo/create_tag.go
rename to internal/api/controller/repo/create_commit_tag.go
index ebb0d9cbf..ed474dcba 100644
--- a/internal/api/controller/repo/create_tag.go
+++ b/internal/api/controller/repo/create_commit_tag.go
@@ -7,6 +7,7 @@ package repo
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/harness/gitness/gitrpc"
 	apiauth "github.com/harness/gitness/internal/api/auth"
@@ -14,18 +15,21 @@ import (
 	"github.com/harness/gitness/types/enum"
 )
 
-// CreateBranchInput used for branch creation apis.
-type CreateTagInput struct {
+// CreateCommitTagInput used for tag creation apis.
+type CreateCommitTagInput struct {
 	Name string `json:"name"`
-	// Target is the commit (or points to the commit) the new branch will be pointing to.
-	// If no target is provided, the branch points to the same commit as the default branch of the repo.
-	Target  *string `json:"target"`
-	Message *string `json:"message"`
+	// Target is the commit (or points to the commit) the new tag will be pointing to.
+	// If no target is provided, the tag points to the same commit as the default branch of the repo.
+	Target string `json:"target"`
+
+	// Message is the optional message the tag will be created with - if the message is empty
+	// the tag will be lightweight, otherwise it'll be annotated.
+	Message string `json:"message"`
 }
 
-// CreateTag creates a new tag for a repo.
-func (c *Controller) CreateTag(ctx context.Context, session *auth.Session,
-	repoRef string, in *CreateTagInput) (*CommitTag, error) {
+// CreateCommitTag creates a new tag for a repo.
+func (c *Controller) CreateCommitTag(ctx context.Context, session *auth.Session,
+	repoRef string, in *CreateCommitTagInput) (*CommitTag, error) {
 	repo, err := c.repoStore.FindByRef(ctx, repoRef)
 	if err != nil {
 		return nil, err
@@ -36,8 +40,8 @@ func (c *Controller) CreateTag(ctx context.Context, session *auth.Session,
 	}
 
 	// set target to default branch in case no branch or commit was provided
-	if in.Target == nil || *in.Target == "" {
-		in.Target = &repo.DefaultBranch
+	if in.Target == "" {
+		in.Target = repo.DefaultBranch
 	}
 
 	writeParams, err := CreateRPCWriteParams(ctx, c.urlProvider, session, repo)
@@ -45,11 +49,14 @@ func (c *Controller) CreateTag(ctx context.Context, session *auth.Session,
 		return nil, fmt.Errorf("failed to create RPC write params: %w", err)
 	}
 
-	rpcOut, err := c.gitRPCClient.CreateTag(ctx, &gitrpc.CreateTagParams{
+	now := time.Now()
+	rpcOut, err := c.gitRPCClient.CreateCommitTag(ctx, &gitrpc.CreateCommitTagParams{
 		WriteParams: writeParams,
 		Name:        in.Name,
-		SHA:         *in.Target,
-		Message:     *in.Message,
+		Target:      in.Target,
+		Message:     in.Message,
+		Tagger:      rpcIdentityFromPrincipal(session.Principal),
+		TaggerDate:  &now,
 	})
 
 	if err != nil {
diff --git a/internal/api/controller/repo/move.go b/internal/api/controller/repo/move.go
index a4a87ab09..f0cdf8bf2 100644
--- a/internal/api/controller/repo/move.go
+++ b/internal/api/controller/repo/move.go
@@ -7,6 +7,8 @@ package repo
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"strings"
 	"time"
 
 	apiauth "github.com/harness/gitness/internal/api/auth"
@@ -20,13 +22,34 @@ import (
 // MoveInput is used for moving a repo.
 type MoveInput struct {
 	UID         *string `json:"uid"`
-	ParentID    *int64  `json:"parent_id"`
+	ParentRef   *string `json:"parent_ref"`
 	KeepAsAlias bool    `json:"keep_as_alias"`
 }
 
 func (i *MoveInput) hasChanges(repo *types.Repository) bool {
-	return (i.UID != nil && *i.UID != repo.UID) ||
-		(i.ParentID != nil && *i.ParentID != repo.ParentID)
+	if i.UID != nil && *i.UID != repo.UID {
+		return true
+	}
+
+	if i.ParentRef != nil {
+		parentRefAsID, err := strconv.ParseInt(*i.ParentRef, 10, 64)
+		// if parsing was successful, user provided actual space id
+		if err == nil && parentRefAsID != repo.ParentID {
+			return true
+		}
+
+		// if parsing was unsuccessful, user provided input as path
+		if err != nil {
+			// repo is an existing entity, assume that path is not empty and thus no error
+			repoParentPath, _, _ := paths.DisectLeaf(repo.Path)
+			parentRefAsPath := *i.ParentRef
+			if parentRefAsPath != repoParentPath {
+				return true
+			}
+		}
+	}
+
+	return false
 }
 
 // Move moves a repository to a new space and/or uid.
@@ -40,15 +63,22 @@ func (c *Controller) Move(ctx context.Context, session *auth.Session,
 	}
 
 	permission := enum.PermissionRepoEdit
-	if in.ParentID != nil && *in.ParentID != repo.ParentID {
+	var inParentSpaceID *int64
+	if in.ParentRef != nil {
 		// ensure user has access to new space (parentId not sanitized!)
-		if err = c.checkAuthRepoCreation(ctx, session, *in.ParentID); err != nil {
+		inParentSpace, err := c.getSpaceCheckAuthRepoCreation(ctx, session, *in.ParentRef)
+		if err != nil {
 			return nil, fmt.Errorf("failed to verify repo creation permissions on new parent space: %w", err)
 		}
 
-		// TODO: what would be correct permissions on repo? (technically we are deleting it from the old space)
-		permission = enum.PermissionRepoDelete
+		inParentSpaceID = &inParentSpace.ID
+
+		if inParentSpace.ID != repo.ParentID {
+			// TODO: what would be correct permissions on repo? (technically we are deleting it from the old space)
+			permission = enum.PermissionRepoDelete
+		}
 	}
+
 	if err = apiauth.CheckRepo(ctx, c.authorizer, session, repo, permission, false); err != nil {
 		return nil, err
 	}
@@ -66,8 +96,8 @@ func (c *Controller) Move(ctx context.Context, session *auth.Session,
 			if in.UID != nil {
 				r.UID = *in.UID
 			}
-			if in.ParentID != nil {
-				r.ParentID = *in.ParentID
+			if inParentSpaceID != nil {
+				r.ParentID = *inParentSpaceID
 			}
 			return nil
 		})
@@ -132,8 +162,9 @@ func (c *Controller) sanitizeMoveInput(in *MoveInput) error {
 		}
 	}
 
-	if in.ParentID != nil {
-		if *in.ParentID <= 0 {
+	if in.ParentRef != nil {
+		parentRefAsID, err := strconv.ParseInt(*in.ParentRef, 10, 64)
+		if (err == nil && parentRefAsID <= 0) || (len(strings.TrimSpace(*in.ParentRef)) == 0) {
 			return errRepositoryRequiresParent
 		}
 	}
diff --git a/internal/api/controller/serviceaccount/create_token.go b/internal/api/controller/serviceaccount/create_token.go
index dfa3ebd4c..46636de00 100644
--- a/internal/api/controller/serviceaccount/create_token.go
+++ b/internal/api/controller/serviceaccount/create_token.go
@@ -18,7 +18,7 @@ import (
 
 type CreateTokenInput struct {
 	UID      string           `json:"uid"`
-	Lifetime time.Duration    `json:"lifetime"`
+	Lifetime *time.Duration   `json:"lifetime"`
 	Grants   enum.AccessGrant `json:"grants"`
 }
 
@@ -33,7 +33,7 @@ func (c *Controller) CreateToken(ctx context.Context, session *auth.Session,
 	if err = check.UID(in.UID); err != nil {
 		return nil, err
 	}
-	if err = check.TokenLifetime(in.Lifetime); err != nil {
+	if err = check.TokenLifetime(in.Lifetime, true); err != nil {
 		return nil, err
 	}
 	// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
diff --git a/internal/api/controller/space/controller.go b/internal/api/controller/space/controller.go
index 96e55201e..25f1b626f 100644
--- a/internal/api/controller/space/controller.go
+++ b/internal/api/controller/space/controller.go
@@ -15,31 +15,34 @@ import (
 )
 
 type Controller struct {
-	db             *sqlx.DB
-	urlProvider    *url.Provider
-	uidCheck       check.PathUID
-	authorizer     authz.Authorizer
-	pathStore      store.PathStore
-	spaceStore     store.SpaceStore
-	repoStore      store.RepoStore
-	principalStore store.PrincipalStore
-	repoCtrl       *repo.Controller
+	db              *sqlx.DB
+	urlProvider     *url.Provider
+	uidCheck        check.PathUID
+	authorizer      authz.Authorizer
+	pathStore       store.PathStore
+	spaceStore      store.SpaceStore
+	repoStore       store.RepoStore
+	principalStore  store.PrincipalStore
+	repoCtrl        *repo.Controller
+	membershipStore store.MembershipStore
 }
 
 func NewController(db *sqlx.DB, urlProvider *url.Provider,
 	uidCheck check.PathUID, authorizer authz.Authorizer,
 	pathStore store.PathStore, spaceStore store.SpaceStore,
 	repoStore store.RepoStore, principalStore store.PrincipalStore, repoCtrl *repo.Controller,
+	membershipStore store.MembershipStore,
 ) *Controller {
 	return &Controller{
-		db:             db,
-		urlProvider:    urlProvider,
-		uidCheck:       uidCheck,
-		authorizer:     authorizer,
-		pathStore:      pathStore,
-		spaceStore:     spaceStore,
-		repoStore:      repoStore,
-		principalStore: principalStore,
-		repoCtrl:       repoCtrl,
+		db:              db,
+		urlProvider:     urlProvider,
+		uidCheck:        uidCheck,
+		authorizer:      authorizer,
+		pathStore:       pathStore,
+		spaceStore:      spaceStore,
+		repoStore:       repoStore,
+		principalStore:  principalStore,
+		repoCtrl:        repoCtrl,
+		membershipStore: membershipStore,
 	}
 }
diff --git a/internal/api/controller/space/create.go b/internal/api/controller/space/create.go
index c5d27777a..c5a3081ba 100644
--- a/internal/api/controller/space/create.go
+++ b/internal/api/controller/space/create.go
@@ -7,12 +7,14 @@ package space
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/internal/bootstrap"
 	"github.com/harness/gitness/internal/paths"
 	"github.com/harness/gitness/store/database/dbtx"
 	"github.com/harness/gitness/types"
@@ -26,15 +28,18 @@ var (
 )
 
 type CreateInput struct {
-	ParentID    int64  `json:"parent_id"`
+	ParentRef   string `json:"parent_ref"`
 	UID         string `json:"uid"`
 	Description string `json:"description"`
 	IsPublic    bool   `json:"is_public"`
 }
 
 // Create creates a new space.
+//
+//nolint:gocognit // refactor if required
 func (c *Controller) Create(ctx context.Context, session *auth.Session, in *CreateInput) (*types.Space, error) {
-	if err := c.checkAuthSpaceCreation(ctx, session, in.ParentID); err != nil {
+	parentSpace, err := c.getSpaceCheckAuthSpaceCreation(ctx, session, in.ParentRef)
+	if err != nil {
 		return nil, err
 	}
 
@@ -43,11 +48,13 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 	}
 
 	var space *types.Space
-	err := dbtx.New(c.db).WithTx(ctx, func(ctx context.Context) error {
+	err = dbtx.New(c.db).WithTx(ctx, func(ctx context.Context) error {
 		spacePath := in.UID
-		if in.ParentID > 0 {
+		parentSpaceID := int64(0)
+		if parentSpace != nil {
+			parentSpaceID = parentSpace.ID
 			// lock parent space path to ensure it doesn't get updated while we setup new space
-			parentPath, err := c.pathStore.FindPrimaryWithLock(ctx, enum.PathTargetTypeSpace, in.ParentID)
+			parentPath, err := c.pathStore.FindPrimaryWithLock(ctx, enum.PathTargetTypeSpace, parentSpaceID)
 			if err != nil {
 				return usererror.BadRequest("Parent not found")
 			}
@@ -63,7 +70,7 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 		now := time.Now().UnixMilli()
 		space = &types.Space{
 			Version:     0,
-			ParentID:    in.ParentID,
+			ParentID:    parentSpaceID,
 			UID:         in.UID,
 			Path:        spacePath,
 			Description: in.Description,
@@ -72,7 +79,7 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 			Created:     now,
 			Updated:     now,
 		}
-		err := c.spaceStore.Create(ctx, space)
+		err = c.spaceStore.Create(ctx, space)
 		if err != nil {
 			return fmt.Errorf("space creation failed: %w", err)
 		}
@@ -84,14 +91,35 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 			TargetType: enum.PathTargetTypeSpace,
 			TargetID:   space.ID,
 			CreatedBy:  space.CreatedBy,
-			Created:    space.Created,
-			Updated:    space.Updated,
+			Created:    now,
+			Updated:    now,
 		}
 		err = c.pathStore.Create(ctx, path)
 		if err != nil {
 			return fmt.Errorf("failed to create path: %w", err)
 		}
 
+		// add space membership to top level space only (as the user doesn't have inherited permissions already)
+		parentRefAsID, err := strconv.ParseInt(in.ParentRef, 10, 64)
+		if (err == nil && parentRefAsID == 0) || (len(strings.TrimSpace(in.ParentRef)) == 0) {
+			membership := &types.Membership{
+				MembershipKey: types.MembershipKey{
+					SpaceID:     space.ID,
+					PrincipalID: session.Principal.ID,
+				},
+				Role: enum.MembershipRoleSpaceOwner,
+
+				// membership has been created by the system
+				CreatedBy: bootstrap.NewSystemServiceSession().Principal.ID,
+				Created:   now,
+				Updated:   now,
+			}
+			err = c.membershipStore.Create(ctx, membership)
+			if err != nil {
+				return fmt.Errorf("failed to make user owner of the space: %w", err)
+			}
+		}
+
 		return nil
 	})
 	if err != nil {
@@ -101,19 +129,25 @@ func (c *Controller) Create(ctx context.Context, session *auth.Session, in *Crea
 	return space, nil
 }
 
-func (c *Controller) checkAuthSpaceCreation(ctx context.Context, session *auth.Session, parentID int64) error {
-	if parentID <= 0 {
+func (c *Controller) getSpaceCheckAuthSpaceCreation(
+	ctx context.Context,
+	session *auth.Session,
+	parentRef string,
+) (*types.Space, error) {
+	parentRefAsID, err := strconv.ParseInt(parentRef, 10, 64)
+	if (parentRefAsID <= 0 && err == nil) || (len(strings.TrimSpace(parentRef)) == 0) {
 		// TODO: Restrict top level space creation.
 		if session == nil {
-			return usererror.ErrUnauthorized
+			return nil, usererror.ErrUnauthorized
 		}
 
-		return nil
+		//nolint:nilnil
+		return nil, nil
 	}
 
-	parentSpace, err := c.spaceStore.Find(ctx, parentID)
+	parentSpace, err := c.spaceStore.FindByRef(ctx, parentRef)
 	if err != nil {
-		return fmt.Errorf("failed to get parent space: %w", err)
+		return nil, fmt.Errorf("failed to get parent space: %w", err)
 	}
 
 	// create is a special case - check permission without specific resource
@@ -123,18 +157,25 @@ func (c *Controller) checkAuthSpaceCreation(ctx context.Context, session *auth.S
 		Name: "",
 	}
 	if err = apiauth.Check(ctx, c.authorizer, session, scope, resource, enum.PermissionSpaceCreate); err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return parentSpace, nil
 }
 
 func (c *Controller) sanitizeCreateInput(in *CreateInput) error {
-	if in.ParentID < 0 {
+	parentRefAsID, err := strconv.ParseInt(in.ParentRef, 10, 64)
+
+	if err == nil && parentRefAsID < 0 {
 		return errParentIDNegative
 	}
 
-	if err := c.uidCheck(in.UID, in.ParentID == 0); err != nil {
+	isRoot := false
+	if (err == nil && parentRefAsID == 0) || (len(strings.TrimSpace(in.ParentRef)) == 0) {
+		isRoot = true
+	}
+
+	if err := c.uidCheck(in.UID, isRoot); err != nil {
 		return err
 	}
 
diff --git a/internal/api/controller/space/delete.go b/internal/api/controller/space/delete.go
index 10547d127..5a4e96dbd 100644
--- a/internal/api/controller/space/delete.go
+++ b/internal/api/controller/space/delete.go
@@ -36,7 +36,7 @@ func (c *Controller) Delete(ctx context.Context, session *auth.Session, spaceRef
 func (c *Controller) DeleteNoAuth(ctx context.Context, session *auth.Session, spaceID int64) error {
 	filter := &types.SpaceFilter{
 		Page:  1,
-		Size:  int(math.MaxInt),
+		Size:  math.MaxInt,
 		Query: "",
 		Order: enum.OrderAsc,
 		Sort:  enum.SpaceAttrNone,
diff --git a/internal/api/controller/space/list_spaces.go b/internal/api/controller/space/list_spaces.go
index 2e2d7db83..e2f2d5ea5 100644
--- a/internal/api/controller/space/list_spaces.go
+++ b/internal/api/controller/space/list_spaces.go
@@ -10,13 +10,17 @@ import (
 
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/store/database/dbtx"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
 )
 
 // ListSpaces lists the child spaces of a space.
-func (c *Controller) ListSpaces(ctx context.Context, session *auth.Session,
-	spaceRef string, filter *types.SpaceFilter) ([]*types.Space, int64, error) {
+func (c *Controller) ListSpaces(ctx context.Context,
+	session *auth.Session,
+	spaceRef string,
+	filter *types.SpaceFilter,
+) ([]types.Space, int64, error) {
 	space, err := c.spaceStore.FindByRef(ctx, spaceRef)
 	if err != nil {
 		return nil, 0, err
@@ -28,20 +32,30 @@ func (c *Controller) ListSpaces(ctx context.Context, session *auth.Session,
 	return c.ListSpacesNoAuth(ctx, space.ID, filter)
 }
 
-// List spaces WITHOUT checking PermissionSpaceView.
+// ListSpacesNoAuth lists spaces WITHOUT checking PermissionSpaceView.
 func (c *Controller) ListSpacesNoAuth(
 	ctx context.Context,
 	spaceID int64,
 	filter *types.SpaceFilter,
-) ([]*types.Space, int64, error) {
-	count, err := c.spaceStore.Count(ctx, spaceID, filter)
-	if err != nil {
-		return nil, 0, fmt.Errorf("failed to count child spaces: %w", err)
-	}
+) ([]types.Space, int64, error) {
+	var spaces []types.Space
+	var count int64
 
-	spaces, err := c.spaceStore.List(ctx, spaceID, filter)
+	err := dbtx.New(c.db).WithTx(ctx, func(ctx context.Context) (err error) {
+		count, err = c.spaceStore.Count(ctx, spaceID, filter)
+		if err != nil {
+			return fmt.Errorf("failed to count child spaces: %w", err)
+		}
+
+		spaces, err = c.spaceStore.List(ctx, spaceID, filter)
+		if err != nil {
+			return fmt.Errorf("failed to list child spaces: %w", err)
+		}
+
+		return nil
+	}, dbtx.TxDefaultReadOnly)
 	if err != nil {
-		return nil, 0, fmt.Errorf("failed to list child spaces: %w", err)
+		return nil, 0, err
 	}
 
 	/*
diff --git a/internal/api/controller/space/membership_add.go b/internal/api/controller/space/membership_add.go
new file mode 100644
index 000000000..0a9f452c8
--- /dev/null
+++ b/internal/api/controller/space/membership_add.go
@@ -0,0 +1,100 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/api/usererror"
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/store"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+
+	"github.com/pkg/errors"
+)
+
+type MembershipAddInput struct {
+	UserUID string              `json:"user_uid"`
+	Role    enum.MembershipRole `json:"role"`
+}
+
+func (in *MembershipAddInput) Validate() error {
+	if in.UserUID == "" {
+		return usererror.BadRequest("UserUID must be provided")
+	}
+
+	if in.Role == "" {
+		return usererror.BadRequest("Role must be provided")
+	}
+
+	role, ok := in.Role.Sanitize()
+	if !ok {
+		msg := fmt.Sprintf("Provided role '%s' is not suppored. Valid values are: %v",
+			in.Role, enum.MembershipRoles)
+		return usererror.BadRequest(msg)
+	}
+
+	in.Role = role
+
+	return nil
+}
+
+// MembershipAdd adds a new membership to a space.
+func (c *Controller) MembershipAdd(ctx context.Context,
+	session *auth.Session,
+	spaceRef string,
+	in *MembershipAddInput,
+) (*types.MembershipUser, error) {
+	space, err := c.spaceStore.FindByRef(ctx, spaceRef)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = apiauth.CheckSpace(ctx, c.authorizer, session, space, enum.PermissionSpaceEdit, false); err != nil {
+		return nil, err
+	}
+
+	err = in.Validate()
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := c.principalStore.FindUserByUID(ctx, in.UserUID)
+	if errors.Is(err, store.ErrResourceNotFound) {
+		return nil, usererror.BadRequestf("User '%s' not found", in.UserUID)
+	} else if err != nil {
+		return nil, fmt.Errorf("failed to find the user: %w", err)
+	}
+
+	now := time.Now().UnixMilli()
+
+	membership := types.Membership{
+		MembershipKey: types.MembershipKey{
+			SpaceID:     space.ID,
+			PrincipalID: user.ID,
+		},
+		CreatedBy: session.Principal.ID,
+		Created:   now,
+		Updated:   now,
+		Role:      in.Role,
+	}
+
+	err = c.membershipStore.Create(ctx, &membership)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create new membership: %w", err)
+	}
+
+	result := &types.MembershipUser{
+		Membership: membership,
+		Principal:  *user.ToPrincipalInfo(),
+		AddedBy:    *session.Principal.ToPrincipalInfo(),
+	}
+
+	return result, nil
+}
diff --git a/internal/api/controller/space/membership_delete.go b/internal/api/controller/space/membership_delete.go
new file mode 100644
index 000000000..0bdc8601d
--- /dev/null
+++ b/internal/api/controller/space/membership_delete.go
@@ -0,0 +1,46 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"context"
+	"fmt"
+
+	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+)
+
+// MembershipDelete removes an existing membership from a space.
+func (c *Controller) MembershipDelete(ctx context.Context,
+	session *auth.Session,
+	spaceRef string,
+	userUID string,
+) error {
+	space, err := c.spaceStore.FindByRef(ctx, spaceRef)
+	if err != nil {
+		return err
+	}
+
+	if err = apiauth.CheckSpace(ctx, c.authorizer, session, space, enum.PermissionSpaceEdit, false); err != nil {
+		return err
+	}
+
+	user, err := c.principalStore.FindUserByUID(ctx, userUID)
+	if err != nil {
+		return fmt.Errorf("failed to find user by uid: %w", err)
+	}
+
+	err = c.membershipStore.Delete(ctx, types.MembershipKey{
+		SpaceID:     space.ID,
+		PrincipalID: user.ID,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to delete user membership: %w", err)
+	}
+
+	return nil
+}
diff --git a/internal/api/controller/space/membership_list.go b/internal/api/controller/space/membership_list.go
new file mode 100644
index 000000000..07630d878
--- /dev/null
+++ b/internal/api/controller/space/membership_list.go
@@ -0,0 +1,54 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"context"
+	"fmt"
+
+	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/store/database/dbtx"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+)
+
+// MembershipList lists all space memberships.
+func (c *Controller) MembershipList(ctx context.Context,
+	session *auth.Session,
+	spaceRef string,
+	opts types.MembershipFilter,
+) ([]types.MembershipUser, int64, error) {
+	space, err := c.spaceStore.FindByRef(ctx, spaceRef)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	if err = apiauth.CheckSpace(ctx, c.authorizer, session, space, enum.PermissionSpaceView, false); err != nil {
+		return nil, 0, err
+	}
+
+	var memberships []types.MembershipUser
+	var membershipsCount int64
+
+	err = dbtx.New(c.db).WithTx(ctx, func(ctx context.Context) error {
+		memberships, err = c.membershipStore.ListUsers(ctx, space.ID, opts)
+		if err != nil {
+			return fmt.Errorf("failed to list memberships for space: %w", err)
+		}
+
+		membershipsCount, err = c.membershipStore.CountUsers(ctx, space.ID, opts)
+		if err != nil {
+			return fmt.Errorf("failed to count memberships for space: %w", err)
+		}
+
+		return nil
+	}, dbtx.TxDefaultReadOnly)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return memberships, membershipsCount, nil
+}
diff --git a/internal/api/controller/space/membership_update.go b/internal/api/controller/space/membership_update.go
new file mode 100644
index 000000000..4c86f8a4f
--- /dev/null
+++ b/internal/api/controller/space/membership_update.go
@@ -0,0 +1,85 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"context"
+	"fmt"
+
+	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/api/usererror"
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+)
+
+type MembershipUpdateInput struct {
+	Role enum.MembershipRole `json:"role"`
+}
+
+func (in *MembershipUpdateInput) Validate() error {
+	if in.Role == "" {
+		return usererror.BadRequest("Role must be provided")
+	}
+
+	role, ok := in.Role.Sanitize()
+	if !ok {
+		msg := fmt.Sprintf("Provided role '%s' is not suppored. Valid values are: %v",
+			in.Role, enum.MembershipRoles)
+		return usererror.BadRequest(msg)
+	}
+
+	in.Role = role
+
+	return nil
+}
+
+// MembershipUpdate changes the role of an existing membership.
+func (c *Controller) MembershipUpdate(ctx context.Context,
+	session *auth.Session,
+	spaceRef string,
+	userUID string,
+	in *MembershipUpdateInput,
+) (*types.MembershipUser, error) {
+	space, err := c.spaceStore.FindByRef(ctx, spaceRef)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = apiauth.CheckSpace(ctx, c.authorizer, session, space, enum.PermissionSpaceEdit, false); err != nil {
+		return nil, err
+	}
+
+	err = in.Validate()
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := c.principalStore.FindUserByUID(ctx, userUID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find user by uid: %w", err)
+	}
+
+	membership, err := c.membershipStore.FindUser(ctx, types.MembershipKey{
+		SpaceID:     space.ID,
+		PrincipalID: user.ID,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to find membership for update: %w", err)
+	}
+
+	if membership.Role == in.Role {
+		return membership, nil
+	}
+
+	membership.Role = in.Role
+
+	err = c.membershipStore.Update(ctx, &membership.Membership)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update membership")
+	}
+
+	return membership, nil
+}
diff --git a/internal/api/controller/space/move.go b/internal/api/controller/space/move.go
index eb9cc6696..bc454a234 100644
--- a/internal/api/controller/space/move.go
+++ b/internal/api/controller/space/move.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -20,18 +21,41 @@ import (
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 )
 
 // MoveInput is used for moving a space.
 type MoveInput struct {
 	UID         *string `json:"uid"`
-	ParentID    *int64  `json:"parent_id"`
+	ParentRef   *string `json:"parent_ref"`
 	KeepAsAlias bool    `json:"keep_as_alias"`
 }
 
 func (i *MoveInput) hasChanges(space *types.Space) bool {
-	return (i.UID != nil && *i.UID != space.UID) ||
-		(i.ParentID != nil && *i.ParentID != space.ParentID)
+	if i.UID != nil && *i.UID != space.UID {
+		return true
+	}
+
+	if i.ParentRef != nil {
+		parentRefAsID, err := strconv.ParseInt(*i.ParentRef, 10, 64)
+		// if parsing was successful, user provided actual space id
+		if err == nil && parentRefAsID != space.ParentID {
+			return true
+		}
+
+		// if parsing was unsuccessful, user provided input as path
+		if err != nil {
+			// space is an existing entity, assume that path is not empty and thus no error
+			spaceParentPath, _, _ := paths.DisectLeaf(space.Path)
+			parentRefAsPath := *i.ParentRef
+			if parentRefAsPath != spaceParentPath {
+				return true
+			}
+		}
+	}
+
+	return false
 }
 
 // Move moves a space to a new space and/or name.
@@ -44,16 +68,27 @@ func (c *Controller) Move(ctx context.Context, session *auth.Session,
 		return nil, err
 	}
 
+	var inParentSpaceID *int64
 	permission := enum.PermissionSpaceEdit
-	if in.ParentID != nil && *in.ParentID != space.ParentID {
+	if in.ParentRef != nil {
 		// ensure user has access to new space (parentId not sanitized!)
-		if err = c.checkAuthSpaceCreation(ctx, session, *in.ParentID); err != nil {
+		inParentSpace, err := c.getSpaceCheckAuthSpaceCreation(ctx, session, *in.ParentRef)
+		if err != nil {
 			return nil, fmt.Errorf("failed to verify space creation permissions on new parent space: %w", err)
 		}
 
-		// TODO: what would be correct permissions on space? (technically we are deleting it from the old space)
-		permission = enum.PermissionSpaceDelete
+		if inParentSpace != nil {
+			inParentSpaceID = &inParentSpace.ID
+		} else {
+			inParentSpaceID = ptr.Int64(0)
+		}
+
+		if *inParentSpaceID != space.ParentID {
+			// TODO: what would be correct permissions on space? (technically we are deleting it from the old space)
+			permission = enum.PermissionSpaceDelete
+		}
 	}
+
 	if err = apiauth.CheckSpace(ctx, c.authorizer, session, space, permission, false); err != nil {
 		return nil, err
 	}
@@ -71,9 +106,11 @@ func (c *Controller) Move(ctx context.Context, session *auth.Session,
 			if in.UID != nil {
 				s.UID = *in.UID
 			}
-			if in.ParentID != nil {
-				s.ParentID = *in.ParentID
+
+			if inParentSpaceID != nil {
+				s.ParentID = *inParentSpaceID
 			}
+
 			return nil
 		})
 		if err != nil {
@@ -121,11 +158,16 @@ func (c *Controller) Move(ctx context.Context, session *auth.Session,
 }
 
 func (c *Controller) sanitizeMoveInput(in *MoveInput, isRoot bool) error {
-	if in.ParentID != nil {
-		if *in.ParentID < 0 {
+	if in.ParentRef != nil {
+		parentRefAsID, err := strconv.ParseInt(*in.ParentRef, 10, 64)
+
+		if err == nil && parentRefAsID < 0 {
 			return errParentIDNegative
 		}
-		isRoot = *in.ParentID == 0
+
+		if (err == nil && parentRefAsID == 0) || (len(strings.TrimSpace(*in.ParentRef)) == 0) {
+			isRoot = true
+		}
 	}
 
 	if in.UID != nil {
diff --git a/internal/api/controller/space/wire.go b/internal/api/controller/space/wire.go
index f49648337..d8b9cbbba 100644
--- a/internal/api/controller/space/wire.go
+++ b/internal/api/controller/space/wire.go
@@ -22,6 +22,11 @@ var WireSet = wire.NewSet(
 
 func ProvideController(db *sqlx.DB, urlProvider *url.Provider, uidCheck check.PathUID, authorizer authz.Authorizer,
 	pathStore store.PathStore, spaceStore store.SpaceStore, repoStore store.RepoStore,
-	principalStore store.PrincipalStore, repoCtrl *repo.Controller) *Controller {
-	return NewController(db, urlProvider, uidCheck, authorizer, pathStore, spaceStore, repoStore, principalStore, repoCtrl)
+	principalStore store.PrincipalStore, repoCtrl *repo.Controller,
+	membershipStore store.MembershipStore,
+) *Controller {
+	return NewController(db, urlProvider, uidCheck, authorizer,
+		pathStore, spaceStore, repoStore,
+		principalStore, repoCtrl,
+		membershipStore)
 }
diff --git a/internal/api/controller/user/controller.go b/internal/api/controller/user/controller.go
index 97d22b126..76060c3c1 100644
--- a/internal/api/controller/user/controller.go
+++ b/internal/api/controller/user/controller.go
@@ -21,29 +21,36 @@ type Controller struct {
 	authorizer        authz.Authorizer
 	principalStore    store.PrincipalStore
 	tokenStore        store.TokenStore
-	config            *types.Config
+	membershipStore   store.MembershipStore
 }
 
-func NewController(principalUIDCheck check.PrincipalUID, authorizer authz.Authorizer,
-	principalStore store.PrincipalStore, tokenStore store.TokenStore, config *types.Config) *Controller {
+func NewController(
+	principalUIDCheck check.PrincipalUID,
+	authorizer authz.Authorizer,
+	principalStore store.PrincipalStore,
+	tokenStore store.TokenStore,
+	membershipStore store.MembershipStore,
+) *Controller {
 	return &Controller{
 		principalUIDCheck: principalUIDCheck,
 		authorizer:        authorizer,
 		principalStore:    principalStore,
 		tokenStore:        tokenStore,
-		config:            config,
+		membershipStore:   membershipStore,
 	}
 }
 
 var hashPassword = bcrypt.GenerateFromPassword
 
 func findUserFromUID(ctx context.Context,
-	principalStore store.PrincipalStore, userUID string) (*types.User, error) {
+	principalStore store.PrincipalStore, userUID string,
+) (*types.User, error) {
 	return principalStore.FindUserByUID(ctx, userUID)
 }
 
 func findUserFromEmail(ctx context.Context,
-	principalStore store.PrincipalStore, email string) (*types.User, error) {
+	principalStore store.PrincipalStore, email string,
+) (*types.User, error) {
 	return principalStore.FindUserByEmail(ctx, email)
 }
 
diff --git a/internal/api/controller/user/create.go b/internal/api/controller/user/create.go
index 0a9bdb559..fde9cf1c2 100644
--- a/internal/api/controller/user/create.go
+++ b/internal/api/controller/user/create.go
@@ -75,7 +75,7 @@ func (c *Controller) CreateNoAuth(ctx context.Context, in *CreateInput, admin bo
 		return nil, err
 	}
 
-	uCount, err := c.principalStore.CountUsers(ctx)
+	uCount, err := c.principalStore.CountUsers(ctx, &types.UserFilter{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/controller/user/create_access_token.go b/internal/api/controller/user/create_access_token.go
index 2d69762b3..5738452f4 100644
--- a/internal/api/controller/user/create_access_token.go
+++ b/internal/api/controller/user/create_access_token.go
@@ -18,7 +18,7 @@ import (
 
 type CreateTokenInput struct {
 	UID      string           `json:"uid"`
-	Lifetime time.Duration    `json:"lifetime"`
+	Lifetime *time.Duration   `json:"lifetime"`
 	Grants   enum.AccessGrant `json:"grants"`
 }
 
@@ -40,7 +40,7 @@ func (c *Controller) CreateAccessToken(ctx context.Context, session *auth.Sessio
 	if err = check.UID(in.UID); err != nil {
 		return nil, err
 	}
-	if err = check.TokenLifetime(in.Lifetime); err != nil {
+	if err = check.TokenLifetime(in.Lifetime, true); err != nil {
 		return nil, err
 	}
 	// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
diff --git a/internal/api/controller/user/delete.go b/internal/api/controller/user/delete.go
index 654e73b07..483110e62 100644
--- a/internal/api/controller/user/delete.go
+++ b/internal/api/controller/user/delete.go
@@ -9,7 +9,9 @@ import (
 	"fmt"
 
 	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
 )
 
@@ -21,6 +23,18 @@ func (c *Controller) Delete(ctx context.Context, session *auth.Session,
 		return err
 	}
 
+	// Fail if the user being deleted is the only admin in DB
+	if user.Admin {
+		admUsrCount, err := c.principalStore.CountUsers(ctx, &types.UserFilter{Admin: true})
+		if err != nil {
+			return fmt.Errorf("failed to check admin user count: %w", err)
+		}
+
+		if admUsrCount == 1 {
+			return usererror.BadRequest("cannot delete the only admin user")
+		}
+	}
+
 	// Ensure principal has required permissions on parent
 	if err = apiauth.CheckUser(ctx, c.authorizer, session, user, enum.PermissionUserDelete); err != nil {
 		return err
diff --git a/internal/api/controller/user/list.go b/internal/api/controller/user/list.go
index b7b3890d1..cbe6a5caa 100644
--- a/internal/api/controller/user/list.go
+++ b/internal/api/controller/user/list.go
@@ -28,7 +28,7 @@ func (c *Controller) List(ctx context.Context, session *auth.Session,
 		return nil, 0, err
 	}
 
-	count, err := c.principalStore.CountUsers(ctx)
+	count, err := c.principalStore.CountUsers(ctx, filter)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to count users: %w", err)
 	}
diff --git a/internal/api/controller/user/membership_spaces.go b/internal/api/controller/user/membership_spaces.go
new file mode 100644
index 000000000..a954e45d7
--- /dev/null
+++ b/internal/api/controller/user/membership_spaces.go
@@ -0,0 +1,38 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package user
+
+import (
+	"context"
+	"fmt"
+
+	apiauth "github.com/harness/gitness/internal/api/auth"
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+)
+
+// MembershipSpaces lists all spaces in which the user is a member.
+func (c *Controller) MembershipSpaces(ctx context.Context,
+	session *auth.Session,
+	userUID string,
+) ([]types.MembershipSpace, error) {
+	user, err := findUserFromUID(ctx, c.principalStore, userUID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find user by UID: %w", err)
+	}
+
+	// Ensure principal has required permissions.
+	if err = apiauth.CheckUser(ctx, c.authorizer, session, user, enum.PermissionUserView); err != nil {
+		return nil, err
+	}
+
+	membershipSpaces, err := c.membershipStore.ListSpaces(ctx, user.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list membership spaces for user: %w", err)
+	}
+
+	return membershipSpaces, nil
+}
diff --git a/internal/api/controller/user/wire.go b/internal/api/controller/user/wire.go
index d565f3084..bf8418dbf 100644
--- a/internal/api/controller/user/wire.go
+++ b/internal/api/controller/user/wire.go
@@ -7,7 +7,6 @@ package user
 import (
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
-	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
 
 	"github.com/google/wire"
@@ -18,7 +17,17 @@ var WireSet = wire.NewSet(
 	NewController,
 )
 
-func ProvideController(principalUIDCheck check.PrincipalUID, authorizer authz.Authorizer,
-	principalStore store.PrincipalStore, tokenStore store.TokenStore, config *types.Config) *Controller {
-	return NewController(principalUIDCheck, authorizer, principalStore, tokenStore, config)
+func ProvideController(
+	principalUIDCheck check.PrincipalUID,
+	authorizer authz.Authorizer,
+	principalStore store.PrincipalStore,
+	tokenStore store.TokenStore,
+	membershipStore store.MembershipStore,
+) *Controller {
+	return NewController(
+		principalUIDCheck,
+		authorizer,
+		principalStore,
+		tokenStore,
+		membershipStore)
 }
diff --git a/internal/api/handler/repo/create_tag.go b/internal/api/handler/repo/create_commit_tag.go
similarity index 90%
rename from internal/api/handler/repo/create_tag.go
rename to internal/api/handler/repo/create_commit_tag.go
index 3cfc57764..7dbea64b7 100644
--- a/internal/api/handler/repo/create_tag.go
+++ b/internal/api/handler/repo/create_commit_tag.go
@@ -23,14 +23,14 @@ func HandleCreateCommitTag(repoCtrl *repo.Controller) http.HandlerFunc {
 			return
 		}
 
-		in := new(repo.CreateTagInput)
+		in := new(repo.CreateCommitTagInput)
 		err = json.NewDecoder(r.Body).Decode(in)
 		if err != nil {
 			render.BadRequestf(w, "Invalid request body: %s.", err)
 			return
 		}
 
-		tag, err := repoCtrl.CreateTag(ctx, session, repoRef, in)
+		tag, err := repoCtrl.CreateCommitTag(ctx, session, repoRef, in)
 		if err != nil {
 			render.TranslatedUserError(w, err)
 			return
diff --git a/internal/api/handler/space/delete.go b/internal/api/handler/space/delete.go
index c93b2ead4..acad17621 100644
--- a/internal/api/handler/space/delete.go
+++ b/internal/api/handler/space/delete.go
@@ -7,16 +7,13 @@ package space
 import (
 	"net/http"
 
-	"github.com/harness/gitness/internal/api/controller/repo"
 	"github.com/harness/gitness/internal/api/controller/space"
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/api/request"
 )
 
-/*
- * Deletes a space.
- */
-func HandleDelete(spaceCtrl *space.Controller, repoCtrl *repo.Controller) http.HandlerFunc {
+// HandleDelete handles the delete space HTTP API.
+func HandleDelete(spaceCtrl *space.Controller) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		session, _ := request.AuthSessionFrom(ctx)
diff --git a/internal/api/handler/space/membership_add.go b/internal/api/handler/space/membership_add.go
new file mode 100644
index 000000000..48368cf71
--- /dev/null
+++ b/internal/api/handler/space/membership_add.go
@@ -0,0 +1,43 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/harness/gitness/internal/api/controller/space"
+	"github.com/harness/gitness/internal/api/render"
+	"github.com/harness/gitness/internal/api/request"
+)
+
+// HandleMembershipAdd handles API that adds a new membership to a space.
+func HandleMembershipAdd(spaceCtrl *space.Controller) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		session, _ := request.AuthSessionFrom(ctx)
+
+		spaceRef, err := request.GetSpaceRefFromPath(r)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		in := new(space.MembershipAddInput)
+		err = json.NewDecoder(r.Body).Decode(in)
+		if err != nil {
+			render.BadRequestf(w, "Invalid Request Body: %s.", err)
+			return
+		}
+
+		memberInfo, err := spaceCtrl.MembershipAdd(ctx, session, spaceRef, in)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		render.JSON(w, http.StatusCreated, memberInfo)
+	}
+}
diff --git a/internal/api/handler/pullreq/pr_diff.go b/internal/api/handler/space/membership_delete.go
similarity index 52%
rename from internal/api/handler/pullreq/pr_diff.go
rename to internal/api/handler/space/membership_delete.go
index 86e80e0e1..eed309be6 100644
--- a/internal/api/handler/pullreq/pr_diff.go
+++ b/internal/api/handler/space/membership_delete.go
@@ -2,44 +2,40 @@
 // Use of this source code is governed by the Polyform Free Trial License
 // that can be found in the LICENSE.md file for this repository.
 
-package pullreq
+package space
 
 import (
 	"net/http"
 
-	"github.com/harness/gitness/internal/api/controller/pullreq"
+	"github.com/harness/gitness/internal/api/controller/space"
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/api/request"
 )
 
-// HandleRawDiff returns raw git diff for PR.
-func HandleRawDiff(pullreqCtrl *pullreq.Controller) http.HandlerFunc {
+// HandleMembershipDelete handles API that deletes an existing space membership.
+func HandleMembershipDelete(spaceCtrl *space.Controller) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		session, _ := request.AuthSessionFrom(ctx)
 
-		repoRef, err := request.GetRepoRefFromPath(r)
+		spaceRef, err := request.GetSpaceRefFromPath(r)
 		if err != nil {
 			render.TranslatedUserError(w, err)
 			return
 		}
 
-		pullreqNumber, err := request.GetPullReqNumberFromPath(r)
+		userUID, err := request.GetUserUIDFromPath(r)
 		if err != nil {
 			render.TranslatedUserError(w, err)
 			return
 		}
 
-		setSHAs := func(sourceSHA, mergeBaseSHA string) {
-			w.Header().Set("X-Source-Sha", sourceSHA)
-			w.Header().Set("X-Merge-Base-Sha", mergeBaseSHA)
-		}
-
-		if err = pullreqCtrl.RawDiff(ctx, session, repoRef, pullreqNumber, setSHAs, w); err != nil {
+		err = spaceCtrl.MembershipDelete(ctx, session, spaceRef, userUID)
+		if err != nil {
 			render.TranslatedUserError(w, err)
 			return
 		}
 
-		w.WriteHeader(http.StatusOK)
+		render.DeleteSuccessful(w)
 	}
 }
diff --git a/internal/api/handler/space/membership_list.go b/internal/api/handler/space/membership_list.go
new file mode 100644
index 000000000..715cd48d6
--- /dev/null
+++ b/internal/api/handler/space/membership_list.go
@@ -0,0 +1,38 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"net/http"
+
+	"github.com/harness/gitness/internal/api/controller/space"
+	"github.com/harness/gitness/internal/api/render"
+	"github.com/harness/gitness/internal/api/request"
+)
+
+// HandleMembershipList handles API that lists all memberships of a space.
+func HandleMembershipList(spaceCtrl *space.Controller) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		session, _ := request.AuthSessionFrom(ctx)
+
+		spaceRef, err := request.GetSpaceRefFromPath(r)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		filter := request.ParseMembershipFilter(r)
+
+		memberships, membershipsCount, err := spaceCtrl.MembershipList(ctx, session, spaceRef, filter)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		render.Pagination(r, w, filter.Page, filter.Size, int(membershipsCount))
+		render.JSON(w, http.StatusOK, memberships)
+	}
+}
diff --git a/internal/api/handler/space/membership_update.go b/internal/api/handler/space/membership_update.go
new file mode 100644
index 000000000..ed00f112f
--- /dev/null
+++ b/internal/api/handler/space/membership_update.go
@@ -0,0 +1,49 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package space
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/harness/gitness/internal/api/controller/space"
+	"github.com/harness/gitness/internal/api/render"
+	"github.com/harness/gitness/internal/api/request"
+)
+
+// HandleMembershipUpdate handles API that changes the role of an existing space membership.
+func HandleMembershipUpdate(spaceCtrl *space.Controller) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		session, _ := request.AuthSessionFrom(ctx)
+
+		spaceRef, err := request.GetSpaceRefFromPath(r)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		userUID, err := request.GetUserUIDFromPath(r)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		in := new(space.MembershipUpdateInput)
+		err = json.NewDecoder(r.Body).Decode(in)
+		if err != nil {
+			render.BadRequestf(w, "Invalid Request Body: %s.", err)
+			return
+		}
+
+		memberInfo, err := spaceCtrl.MembershipUpdate(ctx, session, spaceRef, userUID, in)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		render.JSON(w, http.StatusOK, memberInfo)
+	}
+}
diff --git a/internal/api/handler/user/membership_spaces.go b/internal/api/handler/user/membership_spaces.go
new file mode 100644
index 000000000..b869f4f3d
--- /dev/null
+++ b/internal/api/handler/user/membership_spaces.go
@@ -0,0 +1,29 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package user
+
+import (
+	"net/http"
+
+	"github.com/harness/gitness/internal/api/controller/user"
+	"github.com/harness/gitness/internal/api/render"
+	"github.com/harness/gitness/internal/api/request"
+)
+
+func HandleMembershipSpaces(userCtrl *user.Controller) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		session, _ := request.AuthSessionFrom(ctx)
+		userUID := session.Principal.UID
+
+		membershipSpaces, err := userCtrl.MembershipSpaces(ctx, session, userUID)
+		if err != nil {
+			render.TranslatedUserError(w, err)
+			return
+		}
+
+		render.JSON(w, http.StatusOK, membershipSpaces)
+	}
+}
diff --git a/internal/api/openapi/pullreq.go b/internal/api/openapi/pullreq.go
index bd7c42207..fdff3d37f 100644
--- a/internal/api/openapi/pullreq.go
+++ b/internal/api/openapi/pullreq.go
@@ -459,17 +459,6 @@ func pullReqOperations(reflector *openapi3.Reflector) {
 	_ = reflector.SetJSONResponse(&opListCommits, new(usererror.Error), http.StatusNotFound)
 	_ = reflector.Spec.AddOperation(http.MethodGet, "/repos/{repo_ref}/pullreq/{pullreq_number}/commits", opListCommits)
 
-	opRawDiff := openapi3.Operation{}
-	opRawDiff.WithTags("pullreq")
-	opRawDiff.WithMapOfAnything(map[string]interface{}{"operationId": "rawPullReqDiff"})
-	_ = reflector.SetRequest(&opRawDiff, new(pullReqRequest), http.MethodGet)
-	_ = reflector.SetStringResponse(&opRawDiff, http.StatusOK, "text/plain")
-	_ = reflector.SetJSONResponse(&opRawDiff, new(usererror.Error), http.StatusInternalServerError)
-	_ = reflector.SetJSONResponse(&opRawDiff, new(usererror.Error), http.StatusUnauthorized)
-	_ = reflector.SetJSONResponse(&opRawDiff, new(usererror.Error), http.StatusForbidden)
-	_ = reflector.SetJSONResponse(&opRawDiff, new(usererror.Error), http.StatusNotFound)
-	_ = reflector.Spec.AddOperation(http.MethodGet, "/repos/{repo_ref}/pullreq/{pullreq_number}/diff", opRawDiff)
-
 	opMetaData := openapi3.Operation{}
 	opMetaData.WithTags("pullreq")
 	opMetaData.WithMapOfAnything(map[string]interface{}{"operationId": "pullReqMetaData"})
diff --git a/internal/api/openapi/repo.go b/internal/api/openapi/repo.go
index 6f6010050..6d1d0a042 100644
--- a/internal/api/openapi/repo.go
+++ b/internal/api/openapi/repo.go
@@ -134,7 +134,7 @@ type deleteBranchRequest struct {
 
 type createTagRequest struct {
 	repoRequest
-	repo.CreateTagInput
+	repo.CreateCommitTagInput
 }
 
 type listTagsRequest struct {
diff --git a/internal/api/openapi/space.go b/internal/api/openapi/space.go
index 9e5726b4e..0a95c73de 100644
--- a/internal/api/openapi/space.go
+++ b/internal/api/openapi/space.go
@@ -244,4 +244,60 @@ func spaceOperations(reflector *openapi3.Reflector) {
 	_ = reflector.SetJSONResponse(&onDeletePath, new(usererror.Error), http.StatusForbidden)
 	_ = reflector.SetJSONResponse(&onDeletePath, new(usererror.Error), http.StatusNotFound)
 	_ = reflector.Spec.AddOperation(http.MethodDelete, "/spaces/{space_ref}/paths/{path_id}", onDeletePath)
+
+	opMembershipAdd := openapi3.Operation{}
+	opMembershipAdd.WithTags("space")
+	opMembershipAdd.WithMapOfAnything(map[string]interface{}{"operationId": "membershipAdd"})
+	_ = reflector.SetRequest(&opMembershipAdd, struct {
+		spaceRequest
+		space.MembershipAddInput
+	}{}, http.MethodPost)
+	_ = reflector.SetJSONResponse(&opMembershipAdd, &types.Membership{}, http.StatusCreated)
+	_ = reflector.SetJSONResponse(&opMembershipAdd, new(usererror.Error), http.StatusInternalServerError)
+	_ = reflector.SetJSONResponse(&opMembershipAdd, new(usererror.Error), http.StatusUnauthorized)
+	_ = reflector.SetJSONResponse(&opMembershipAdd, new(usererror.Error), http.StatusForbidden)
+	_ = reflector.SetJSONResponse(&opMembershipAdd, new(usererror.Error), http.StatusNotFound)
+	_ = reflector.Spec.AddOperation(http.MethodPost, "/spaces/{space_ref}/members", opMembershipAdd)
+
+	opMembershipDelete := openapi3.Operation{}
+	opMembershipDelete.WithTags("space")
+	opMembershipDelete.WithMapOfAnything(map[string]interface{}{"operationId": "membershipDelete"})
+	_ = reflector.SetRequest(&opMembershipDelete, struct {
+		spaceRequest
+		UserUID string `path:"user_uid"`
+	}{}, http.MethodDelete)
+	_ = reflector.SetJSONResponse(&opMembershipDelete, nil, http.StatusNoContent)
+	_ = reflector.SetJSONResponse(&opMembershipDelete, new(usererror.Error), http.StatusInternalServerError)
+	_ = reflector.SetJSONResponse(&opMembershipDelete, new(usererror.Error), http.StatusUnauthorized)
+	_ = reflector.SetJSONResponse(&opMembershipDelete, new(usererror.Error), http.StatusForbidden)
+	_ = reflector.SetJSONResponse(&opMembershipDelete, new(usererror.Error), http.StatusNotFound)
+	_ = reflector.Spec.AddOperation(http.MethodDelete, "/spaces/{space_ref}/members/{user_uid}", opMembershipDelete)
+
+	opMembershipUpdate := openapi3.Operation{}
+	opMembershipUpdate.WithTags("space")
+	opMembershipUpdate.WithMapOfAnything(map[string]interface{}{"operationId": "membershipUpdate"})
+	_ = reflector.SetRequest(&opMembershipUpdate, &struct {
+		spaceRequest
+		UserUID string `path:"user_uid"`
+		space.MembershipUpdateInput
+	}{}, http.MethodPatch)
+	_ = reflector.SetJSONResponse(&opMembershipUpdate, &types.Membership{}, http.StatusOK)
+	_ = reflector.SetJSONResponse(&opMembershipUpdate, new(usererror.Error), http.StatusInternalServerError)
+	_ = reflector.SetJSONResponse(&opMembershipUpdate, new(usererror.Error), http.StatusUnauthorized)
+	_ = reflector.SetJSONResponse(&opMembershipUpdate, new(usererror.Error), http.StatusForbidden)
+	_ = reflector.SetJSONResponse(&opMembershipUpdate, new(usererror.Error), http.StatusNotFound)
+	_ = reflector.Spec.AddOperation(http.MethodPatch, "/spaces/{space_ref}/members/{user_uid}", opMembershipUpdate)
+
+	opMembershipList := openapi3.Operation{}
+	opMembershipList.WithTags("space")
+	opMembershipList.WithMapOfAnything(map[string]interface{}{"operationId": "membershipList"})
+	_ = reflector.SetRequest(&opMembershipList, &struct {
+		spaceRequest
+	}{}, http.MethodGet)
+	_ = reflector.SetJSONResponse(&opMembershipList, []types.Membership{}, http.StatusOK)
+	_ = reflector.SetJSONResponse(&opMembershipList, new(usererror.Error), http.StatusInternalServerError)
+	_ = reflector.SetJSONResponse(&opMembershipList, new(usererror.Error), http.StatusUnauthorized)
+	_ = reflector.SetJSONResponse(&opMembershipList, new(usererror.Error), http.StatusForbidden)
+	_ = reflector.SetJSONResponse(&opMembershipList, new(usererror.Error), http.StatusNotFound)
+	_ = reflector.Spec.AddOperation(http.MethodGet, "/spaces/{space_ref}/members", opMembershipList)
 }
diff --git a/internal/api/openapi/user.go b/internal/api/openapi/user.go
index 0e7c1c32e..b7003efea 100644
--- a/internal/api/openapi/user.go
+++ b/internal/api/openapi/user.go
@@ -44,4 +44,12 @@ func buildUser(reflector *openapi3.Reflector) {
 	_ = reflector.SetJSONResponse(&opToken, new(types.TokenResponse), http.StatusCreated)
 	_ = reflector.SetJSONResponse(&opToken, new(usererror.Error), http.StatusInternalServerError)
 	_ = reflector.Spec.AddOperation(http.MethodPost, "/user/token", opToken)
+
+	opMemberSpaces := openapi3.Operation{}
+	opMemberSpaces.WithTags("user")
+	opMemberSpaces.WithMapOfAnything(map[string]interface{}{"operationId": "membershipSpaces"})
+	_ = reflector.SetRequest(&opMemberSpaces, struct{}{}, http.MethodGet)
+	_ = reflector.SetJSONResponse(&opMemberSpaces, new([]types.MembershipSpace), http.StatusOK)
+	_ = reflector.SetJSONResponse(&opMemberSpaces, new(usererror.Error), http.StatusInternalServerError)
+	_ = reflector.Spec.AddOperation(http.MethodGet, "/user/memberships", opMemberSpaces)
 }
diff --git a/internal/api/request/membership.go b/internal/api/request/membership.go
new file mode 100644
index 000000000..4aed70a67
--- /dev/null
+++ b/internal/api/request/membership.go
@@ -0,0 +1,30 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package request
+
+import (
+	"net/http"
+
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+)
+
+// ParseMembershipSort extracts the membership sort parameter from the url.
+func ParseMembershipSort(r *http.Request) enum.MembershipSort {
+	return enum.ParseMembershipSort(
+		r.URL.Query().Get(QueryParamSort),
+	)
+}
+
+// ParseMembershipFilter extracts the membership filter from the url.
+func ParseMembershipFilter(r *http.Request) types.MembershipFilter {
+	return types.MembershipFilter{
+		Page:  ParsePage(r),
+		Size:  ParseLimit(r),
+		Query: ParseQuery(r),
+		Sort:  ParseMembershipSort(r),
+		Order: ParseOrder(r),
+	}
+}
diff --git a/internal/auth/authz/membership.go b/internal/auth/authz/membership.go
new file mode 100644
index 000000000..0bcfc4f19
--- /dev/null
+++ b/internal/auth/authz/membership.go
@@ -0,0 +1,99 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package authz
+
+import (
+	"context"
+
+	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/internal/paths"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+
+	"github.com/rs/zerolog/log"
+)
+
+var _ Authorizer = (*MembershipAuthorizer)(nil)
+
+type MembershipAuthorizer struct {
+	permissionCache PermissionCache
+}
+
+func NewMembershipAuthorizer(
+	permissionCache PermissionCache,
+) *MembershipAuthorizer {
+	return &MembershipAuthorizer{
+		permissionCache: permissionCache,
+	}
+}
+
+func (a *MembershipAuthorizer) Check(
+	ctx context.Context,
+	session *auth.Session,
+	scope *types.Scope,
+	resource *types.Resource,
+	permission enum.Permission,
+) (bool, error) {
+	log.Ctx(ctx).Debug().Msgf(
+		"[MembershipAuthorizer] %s with id '%d' requests %s for %s '%s' in scope %#v with metadata %#v",
+		session.Principal.Type,
+		session.Principal.ID,
+		permission,
+		resource.Type,
+		resource.Name,
+		scope,
+		session.Metadata,
+	)
+
+	if session.Principal.Admin {
+		return true, nil // system admin can call any API
+	}
+
+	var spaceRef string
+
+	switch resource.Type {
+	case enum.ResourceTypeSpace:
+		spaceRef = paths.Concatinate(scope.SpacePath, resource.Name)
+
+	case enum.ResourceTypeRepo:
+		spaceRef = scope.SpacePath
+
+	case enum.ResourceTypeServiceAccount:
+		spaceRef = scope.SpacePath
+
+	case enum.ResourceTypeUser:
+		// a user is allowed to view / edit themselves
+		if resource.Name == session.Principal.UID &&
+			(permission == enum.PermissionUserView || permission == enum.PermissionUserEdit) {
+			return true, nil
+		}
+
+		// everything else is reserved for admins only (like operations on users other than yourself, or setting admin)
+		return false, nil
+
+	// Service operations aren't exposed to users
+	case enum.ResourceTypeService:
+		return false, nil
+
+	default:
+		return false, nil
+	}
+
+	return a.permissionCache.Get(ctx, PermissionCacheKey{
+		PrincipalID: session.Principal.ID,
+		SpaceRef:    spaceRef,
+		Permission:  permission,
+	})
+}
+func (a *MembershipAuthorizer) CheckAll(ctx context.Context, session *auth.Session,
+	permissionChecks ...types.PermissionCheck) (bool, error) {
+	for _, p := range permissionChecks {
+		if _, err := a.Check(ctx, session, &p.Scope, &p.Resource, p.Permission); err != nil {
+			return false, err
+		}
+	}
+
+	return true, nil
+}
diff --git a/internal/auth/authz/membership_cache.go b/internal/auth/authz/membership_cache.go
new file mode 100644
index 000000000..b920c5b04
--- /dev/null
+++ b/internal/auth/authz/membership_cache.go
@@ -0,0 +1,91 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package authz
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/harness/gitness/cache"
+	"github.com/harness/gitness/internal/paths"
+	"github.com/harness/gitness/internal/store"
+	gitness_store "github.com/harness/gitness/store"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+
+	"golang.org/x/exp/slices"
+)
+
+type PermissionCacheKey struct {
+	PrincipalID int64
+	SpaceRef    string
+	Permission  enum.Permission
+}
+type PermissionCache cache.Cache[PermissionCacheKey, bool]
+
+func NewPermissionCache(
+	spaceStore store.SpaceStore,
+	membershipStore store.MembershipStore,
+	cacheDuration time.Duration,
+) PermissionCache {
+	return cache.New[PermissionCacheKey, bool](permissionCacheGetter{
+		spaceStore:      spaceStore,
+		membershipStore: membershipStore,
+	}, cacheDuration)
+}
+
+type permissionCacheGetter struct {
+	spaceStore      store.SpaceStore
+	membershipStore store.MembershipStore
+}
+
+func (g permissionCacheGetter) Find(ctx context.Context, key PermissionCacheKey) (bool, error) {
+	spaceRef := key.SpaceRef
+	principalID := key.PrincipalID
+
+	// Find the starting space.
+	space, err := g.spaceStore.FindByRef(ctx, spaceRef)
+	if err != nil {
+		return false, fmt.Errorf("failed to find space '%s': %w", spaceRef, err)
+	}
+
+	// limit the depth to be safe (e.g. root/space1/space2 => maxDepth of 3)
+	maxDepth := len(paths.Segments(spaceRef))
+
+	for depth := 0; depth < maxDepth; depth++ {
+		// Find the membership in the current space.
+		membership, err := g.membershipStore.Find(ctx, types.MembershipKey{
+			SpaceID:     space.ID,
+			PrincipalID: principalID,
+		})
+		if err != nil && !errors.Is(err, gitness_store.ErrResourceNotFound) {
+			return false, fmt.Errorf("failed to find membership: %w", err)
+		}
+
+		// If the membership is defined in the current space, check if the user has the required permission.
+		if membership != nil {
+			_, hasRole := slices.BinarySearch(membership.Role.Permissions(), key.Permission)
+			if hasRole {
+				return true, nil
+			}
+		}
+
+		// If membership with the requested permission has not been found in the current space,
+		// move to the parent space, if any.
+
+		if space.ParentID == 0 {
+			return false, nil
+		}
+
+		space, err = g.spaceStore.Find(ctx, space.ParentID)
+		if err != nil {
+			return false, fmt.Errorf("failed to find parent space with id %d: %w", space.ParentID, err)
+		}
+	}
+
+	return false, nil
+}
diff --git a/internal/auth/authz/wire.go b/internal/auth/authz/wire.go
index 1e55f48a4..81cd2fc46 100644
--- a/internal/auth/authz/wire.go
+++ b/internal/auth/authz/wire.go
@@ -5,14 +5,27 @@
 package authz
 
 import (
+	"time"
+
+	"github.com/harness/gitness/internal/store"
+
 	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.
 var WireSet = wire.NewSet(
 	ProvideAuthorizer,
+	ProvidePermissionCache,
 )
 
-func ProvideAuthorizer() Authorizer {
-	return NewUnsafeAuthorizer()
+func ProvideAuthorizer(pCache PermissionCache) Authorizer {
+	return NewMembershipAuthorizer(pCache)
+}
+
+func ProvidePermissionCache(
+	spaceStore store.SpaceStore,
+	membershipStore store.MembershipStore,
+) PermissionCache {
+	const permissionCacheTimeout = time.Second * 15
+	return NewPermissionCache(spaceStore, membershipStore, permissionCacheTimeout)
 }
diff --git a/internal/router/api.go b/internal/router/api.go
index 7b4d1f202..b491ed5d1 100644
--- a/internal/router/api.go
+++ b/internal/router/api.go
@@ -125,7 +125,7 @@ func setupRoutesV1(r chi.Router,
 	checkCtrl *check.Controller,
 	sysCtrl *system.Controller,
 ) {
-	setupSpaces(r, spaceCtrl, repoCtrl)
+	setupSpaces(r, spaceCtrl)
 	setupRepos(r, repoCtrl, pullreqCtrl, webhookCtrl, checkCtrl)
 	setupUser(r, userCtrl)
 	setupServiceAccounts(r, saCtrl)
@@ -137,7 +137,7 @@ func setupRoutesV1(r chi.Router,
 	setupResources(r)
 }
 
-func setupSpaces(r chi.Router, spaceCtrl *space.Controller, repoCtrl *repo.Controller) {
+func setupSpaces(r chi.Router, spaceCtrl *space.Controller) {
 	r.Route("/spaces", func(r chi.Router) {
 		// Create takes path and parentId via body, not uri
 		r.Post("/", handlerspace.HandleCreate(spaceCtrl))
@@ -146,7 +146,7 @@ func setupSpaces(r chi.Router, spaceCtrl *space.Controller, repoCtrl *repo.Contr
 			// space operations
 			r.Get("/", handlerspace.HandleFind(spaceCtrl))
 			r.Patch("/", handlerspace.HandleUpdate(spaceCtrl))
-			r.Delete("/", handlerspace.HandleDelete(spaceCtrl, repoCtrl))
+			r.Delete("/", handlerspace.HandleDelete(spaceCtrl))
 
 			r.Post("/move", handlerspace.HandleMove(spaceCtrl))
 			r.Get("/spaces", handlerspace.HandleListSpaces(spaceCtrl))
@@ -163,6 +163,15 @@ func setupSpaces(r chi.Router, spaceCtrl *space.Controller, repoCtrl *repo.Contr
 					r.Delete("/", handlerspace.HandleDeletePath(spaceCtrl))
 				})
 			})
+
+			r.Route("/members", func(r chi.Router) {
+				r.Get("/", handlerspace.HandleMembershipList(spaceCtrl))
+				r.Post("/", handlerspace.HandleMembershipAdd(spaceCtrl))
+				r.Route(fmt.Sprintf("/{%s}", request.PathParamUserUID), func(r chi.Router) {
+					r.Delete("/", handlerspace.HandleMembershipDelete(spaceCtrl))
+					r.Patch("/", handlerspace.HandleMembershipUpdate(spaceCtrl))
+				})
+			})
 		})
 	})
 }
@@ -304,7 +313,6 @@ func SetupPullReq(r chi.Router, pullreqCtrl *pullreq.Controller) {
 				r.Post("/", handlerpullreq.HandleReviewSubmit(pullreqCtrl))
 			})
 			r.Post("/merge", handlerpullreq.HandleMerge(pullreqCtrl))
-			r.Get("/diff", handlerpullreq.HandleRawDiff(pullreqCtrl))
 			r.Get("/commits", handlerpullreq.HandleCommits(pullreqCtrl))
 			r.Get("/metadata", handlerpullreq.HandleMetadata(pullreqCtrl))
 		})
@@ -348,6 +356,7 @@ func setupUser(r chi.Router, userCtrl *user.Controller) {
 		r.Use(middlewareprincipal.RestrictTo(enum.PrincipalTypeUser))
 		r.Get("/", handleruser.HandleFind(userCtrl))
 		r.Patch("/", handleruser.HandleUpdate(userCtrl))
+		r.Get("/memberships", handleruser.HandleMembershipSpaces(userCtrl))
 
 		// PAT
 		r.Route("/tokens", func(r chi.Router) {
diff --git a/internal/services/pullreq/handlers_branch.go b/internal/services/pullreq/handlers_branch.go
index 3dceee943..89b97f404 100644
--- a/internal/services/pullreq/handlers_branch.go
+++ b/internal/services/pullreq/handlers_branch.go
@@ -24,6 +24,21 @@ import (
 func (s *Service) triggerPREventOnBranchUpdate(ctx context.Context,
 	event *events.Event[*gitevents.BranchUpdatedPayload],
 ) error {
+	// we should always update PR mergeable status check when target branch is updated.
+	// - main
+	//    |- develop
+	//         |- feature1
+	//         |- feature2
+	// when feature2 merge changes into develop branch then feature1 branch is not consistent anymore
+	// and need to run mergeable check even nothing was changed on feature1, same applies to main if someone
+	// push new commit to main then develop should merge status should be unchecked.
+	if branch, err := getBranchFromRef(event.Payload.Ref); err == nil {
+		err = s.pullreqStore.UpdateMergeCheckStatus(ctx, event.Payload.RepoID, branch, enum.MergeCheckStatusUnchecked)
+		if err != nil {
+			return err
+		}
+	}
+
 	// TODO: This function is currently executed directly on branch update event.
 	// TODO: But it should be executed after the PR's head ref has been updated.
 	// TODO: This is to make sure the commit exists on the target repository for forked repositories.
@@ -148,17 +163,11 @@ func (s *Service) forEveryOpenPR(ctx context.Context,
 	repoID int64, ref string,
 	fn func(pr *types.PullReq) error,
 ) {
-	const refPrefix = "refs/heads/"
 	const largeLimit = 1000000
 
-	if !strings.HasPrefix(ref, refPrefix) {
-		log.Ctx(ctx).Error().Msg("failed to get branch name from branch ref")
-		return
-	}
-
-	branch := ref[len(refPrefix):]
+	branch, err := getBranchFromRef(ref)
 	if len(branch) == 0 {
-		log.Ctx(ctx).Error().Msg("got an empty branch name from branch ref")
+		log.Ctx(ctx).Err(err).Send()
 		return
 	}
 
@@ -182,3 +191,16 @@ func (s *Service) forEveryOpenPR(ctx context.Context,
 		}
 	}
 }
+
+func getBranchFromRef(ref string) (string, error) {
+	const refPrefix = "refs/heads/"
+	if !strings.HasPrefix(ref, refPrefix) {
+		return "", fmt.Errorf("failed to get branch name from branch ref %s", ref)
+	}
+
+	branch := ref[len(refPrefix):]
+	if len(branch) == 0 {
+		return "", fmt.Errorf("got an empty branch name from branch ref %s", ref)
+	}
+	return branch, nil
+}
diff --git a/internal/store/database.go b/internal/store/database.go
index b59200dc5..fafd43224 100644
--- a/internal/store/database.go
+++ b/internal/store/database.go
@@ -60,8 +60,8 @@ type (
 		// ListUsers returns a list of users.
 		ListUsers(ctx context.Context, params *types.UserFilter) ([]*types.User, error)
 
-		// CountUsers returns a count of users.
-		CountUsers(ctx context.Context) (int64, error)
+		// CountUsers returns a count of users which match the given filter.
+		CountUsers(ctx context.Context, opts *types.UserFilter) (int64, error)
 
 		/*
 		 * SERVICE ACCOUNT RELATED OPERATIONS.
@@ -187,7 +187,7 @@ type (
 		Count(ctx context.Context, id int64, opts *types.SpaceFilter) (int64, error)
 
 		// List returns a list of child spaces in a space.
-		List(ctx context.Context, id int64, opts *types.SpaceFilter) ([]*types.Space, error)
+		List(ctx context.Context, id int64, opts *types.SpaceFilter) ([]types.Space, error)
 	}
 
 	// RepoStore defines the repository data storage.
@@ -223,6 +223,18 @@ type (
 		Find(ctx context.Context, id int64) (*types.RepositoryGitInfo, error)
 	}
 
+	// MembershipStore defines the membership data storage.
+	MembershipStore interface {
+		Find(ctx context.Context, key types.MembershipKey) (*types.Membership, error)
+		FindUser(ctx context.Context, key types.MembershipKey) (*types.MembershipUser, error)
+		Create(ctx context.Context, membership *types.Membership) error
+		Update(ctx context.Context, membership *types.Membership) error
+		Delete(ctx context.Context, key types.MembershipKey) error
+		CountUsers(ctx context.Context, spaceID int64, filter types.MembershipFilter) (int64, error)
+		ListUsers(ctx context.Context, spaceID int64, filter types.MembershipFilter) ([]types.MembershipUser, error)
+		ListSpaces(ctx context.Context, userID int64) ([]types.MembershipSpace, error)
+	}
+
 	// TokenStore defines the token data storage.
 	TokenStore interface {
 		// Find finds the token by id
@@ -273,6 +285,9 @@ type (
 		// It will set new values to the ActivitySeq, Version and Updated fields.
 		UpdateActivitySeq(ctx context.Context, pr *types.PullReq) (*types.PullReq, error)
 
+		// Update all PR where target branch points to new SHA
+		UpdateMergeCheckStatus(ctx context.Context, targetRepo int64, targetBranch string, status enum.MergeCheckStatus) error
+
 		// Delete the pull request.
 		Delete(ctx context.Context, id int64) error
 
diff --git a/internal/store/database/membership.go b/internal/store/database/membership.go
new file mode 100644
index 000000000..4aaf54ebc
--- /dev/null
+++ b/internal/store/database/membership.go
@@ -0,0 +1,409 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package database
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/harness/gitness/internal/store"
+	"github.com/harness/gitness/store/database"
+	"github.com/harness/gitness/store/database/dbtx"
+	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
+
+	"github.com/Masterminds/squirrel"
+	"github.com/jmoiron/sqlx"
+)
+
+var _ store.MembershipStore = (*MembershipStore)(nil)
+
+// NewMembershipStore returns a new MembershipStore.
+func NewMembershipStore(db *sqlx.DB, pCache store.PrincipalInfoCache) *MembershipStore {
+	return &MembershipStore{
+		db:     db,
+		pCache: pCache,
+	}
+}
+
+// MembershipStore implements store.MembershipStore backed by a relational database.
+type MembershipStore struct {
+	db     *sqlx.DB
+	pCache store.PrincipalInfoCache
+}
+
+type membership struct {
+	SpaceID     int64 `db:"membership_space_id"`
+	PrincipalID int64 `db:"membership_principal_id"`
+
+	CreatedBy int64 `db:"membership_created_by"`
+	Created   int64 `db:"membership_created"`
+	Updated   int64 `db:"membership_updated"`
+
+	Role enum.MembershipRole `db:"membership_role"`
+}
+
+type membershipPrincipal struct {
+	membership
+	principalInfo
+}
+
+type membershipSpace struct {
+	membership
+	space
+}
+
+const (
+	membershipColumns = `
+		 membership_space_id
+		,membership_principal_id
+		,membership_created_by
+		,membership_created
+		,membership_updated
+		,membership_role`
+
+	membershipSelectBase = `
+	SELECT` + membershipColumns + `
+	FROM memberships`
+)
+
+// Find finds the membership by space id and principal id.
+func (s *MembershipStore) Find(ctx context.Context, key types.MembershipKey) (*types.Membership, error) {
+	const sqlQuery = membershipSelectBase + `
+	WHERE membership_space_id = $1 AND membership_principal_id = $2`
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	dst := &membership{}
+	if err := db.GetContext(ctx, dst, sqlQuery, key.SpaceID, key.PrincipalID); err != nil {
+		return nil, database.ProcessSQLErrorf(err, "Failed to find membership")
+	}
+
+	result := mapToMembership(dst)
+
+	return &result, nil
+}
+
+func (s *MembershipStore) FindUser(ctx context.Context, key types.MembershipKey) (*types.MembershipUser, error) {
+	m, err := s.Find(ctx, key)
+	if err != nil {
+		return nil, err
+	}
+
+	result, err := s.addPrincipalInfos(ctx, m)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+// Create creates a new membership.
+func (s *MembershipStore) Create(ctx context.Context, membership *types.Membership) error {
+	const sqlQuery = `
+	INSERT INTO memberships (
+		 membership_space_id
+		,membership_principal_id
+		,membership_created_by
+		,membership_created
+		,membership_updated
+		,membership_role
+	) values (
+		 :membership_space_id
+		,:membership_principal_id
+		,:membership_created_by
+		,:membership_created
+		,:membership_updated
+		,:membership_role
+	)`
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	query, arg, err := db.BindNamed(sqlQuery, mapToInternalMembership(membership))
+	if err != nil {
+		return database.ProcessSQLErrorf(err, "Failed to bind membership object")
+	}
+
+	if _, err = db.ExecContext(ctx, query, arg...); err != nil {
+		return database.ProcessSQLErrorf(err, "Failed to insert membership")
+	}
+
+	return nil
+}
+
+// Update updates the role of a member of a space.
+func (s *MembershipStore) Update(ctx context.Context, membership *types.Membership) error {
+	const sqlQuery = `
+	UPDATE memberships
+	SET
+		 membership_updated = :membership_updated
+		,membership_role = :membership_role
+	WHERE membership_space_id = :membership_space_id AND
+	      membership_principal_id = :membership_principal_id`
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	dbMembership := mapToInternalMembership(membership)
+	dbMembership.Updated = time.Now().UnixMilli()
+
+	query, arg, err := db.BindNamed(sqlQuery, dbMembership)
+	if err != nil {
+		return database.ProcessSQLErrorf(err, "Failed to bind membership object")
+	}
+
+	_, err = db.ExecContext(ctx, query, arg...)
+	if err != nil {
+		return database.ProcessSQLErrorf(err, "Failed to update membership role")
+	}
+
+	membership.Updated = dbMembership.Updated
+
+	return nil
+}
+
+// Delete deletes the membership.
+func (s *MembershipStore) Delete(ctx context.Context, key types.MembershipKey) error {
+	const sqlQuery = `
+	DELETE from memberships
+	WHERE membership_space_id = $1 AND
+	      membership_principal_id = $2`
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	if _, err := db.ExecContext(ctx, sqlQuery, key.SpaceID, key.PrincipalID); err != nil {
+		return database.ProcessSQLErrorf(err, "delete membership query failed")
+	}
+	return nil
+}
+
+// CountUsers returns a number of users memberships that matches the provided filter.
+func (s *MembershipStore) CountUsers(ctx context.Context,
+	spaceID int64,
+	filter types.MembershipFilter,
+) (int64, error) {
+	stmt := database.Builder.
+		Select("count(*)").
+		From("memberships").
+		InnerJoin("principals ON membership_principal_id = principal_id").
+		Where("membership_space_id = ?", spaceID)
+
+	stmt = prepareMembershipListUsersStmt(stmt, filter)
+
+	sql, args, err := stmt.ToSql()
+	if err != nil {
+		return 0, fmt.Errorf("failed to convert membership count query to sql: %w", err)
+	}
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	var count int64
+	err = db.QueryRowContext(ctx, sql, args...).Scan(&count)
+	if err != nil {
+		return 0, database.ProcessSQLErrorf(err, "Failed executing membership count query")
+	}
+
+	return count, nil
+}
+
+// ListUsers returns a list of memberships for a space or a user.
+func (s *MembershipStore) ListUsers(ctx context.Context,
+	spaceID int64,
+	filter types.MembershipFilter,
+) ([]types.MembershipUser, error) {
+	const columns = membershipColumns + "," + principalInfoCommonColumns
+	stmt := database.Builder.
+		Select(columns).
+		From("memberships").
+		InnerJoin("principals ON membership_principal_id = principal_id").
+		Where("membership_space_id = ?", spaceID)
+
+	stmt = prepareMembershipListUsersStmt(stmt, filter)
+	stmt = stmt.Limit(database.Limit(filter.Size))
+	stmt = stmt.Offset(database.Offset(filter.Page, filter.Size))
+
+	order := filter.Order
+	if order == enum.OrderDefault {
+		order = enum.OrderAsc
+	}
+
+	switch filter.Sort {
+	case enum.MembershipSortName:
+		stmt = stmt.OrderBy("principal_display_name " + order.String())
+	case enum.MembershipSortCreated:
+		stmt = stmt.OrderBy("membership_created " + order.String())
+	case enum.MembershipSortNone:
+	}
+
+	sql, args, err := stmt.ToSql()
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert membership users list query to sql: %w", err)
+	}
+
+	dst := make([]*membershipPrincipal, 0)
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	if err = db.SelectContext(ctx, &dst, sql, args...); err != nil {
+		return nil, database.ProcessSQLErrorf(err, "Failed executing membership users list query")
+	}
+
+	result, err := s.mapToMembershipUsers(ctx, dst)
+	if err != nil {
+		return nil, fmt.Errorf("failed to map memberships users to external type: %w", err)
+	}
+
+	return result, nil
+}
+
+func prepareMembershipListUsersStmt(
+	stmt squirrel.SelectBuilder,
+	opts types.MembershipFilter,
+) squirrel.SelectBuilder {
+	if opts.Query != "" {
+		searchTerm := "%%" + strings.ToLower(opts.Query) + "%%"
+		stmt = stmt.Where("LOWER(principal_display_name) LIKE ?", searchTerm)
+	}
+
+	return stmt
+}
+
+// ListSpaces returns a list of spaces in which the provided user is a member.
+func (s *MembershipStore) ListSpaces(ctx context.Context,
+	userID int64,
+) ([]types.MembershipSpace, error) {
+	const columns = membershipColumns + "," + spaceColumnsForJoin
+	stmt := database.Builder.
+		Select(columns).
+		From("memberships").
+		InnerJoin("spaces ON spaces.space_id = membership_space_id").
+		InnerJoin(`paths ON spaces.space_id=paths.path_space_id AND paths.path_is_primary=true`).
+		Where("membership_principal_id = ?", userID).
+		OrderBy("space_path asc")
+
+	sql, args, err := stmt.ToSql()
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert membership spaces list query to sql: %w", err)
+	}
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	dst := make([]*membershipSpace, 0)
+	if err = db.SelectContext(ctx, &dst, sql, args...); err != nil {
+		return nil, database.ProcessSQLErrorf(err, "Failed executing custom list query")
+	}
+
+	result, err := s.mapToMembershipSpaces(ctx, dst)
+	if err != nil {
+		return nil, fmt.Errorf("failed to map memberships spaces to external type: %w", err)
+	}
+
+	return result, nil
+}
+
+func mapToMembership(m *membership) types.Membership {
+	return types.Membership{
+		MembershipKey: types.MembershipKey{
+			SpaceID:     m.SpaceID,
+			PrincipalID: m.PrincipalID,
+		},
+		CreatedBy: m.CreatedBy,
+		Created:   m.Created,
+		Updated:   m.Updated,
+		Role:      m.Role,
+	}
+}
+
+func mapToInternalMembership(m *types.Membership) membership {
+	return membership{
+		SpaceID:     m.SpaceID,
+		PrincipalID: m.PrincipalID,
+		CreatedBy:   m.CreatedBy,
+		Created:     m.Created,
+		Updated:     m.Updated,
+		Role:        m.Role,
+	}
+}
+
+func (s *MembershipStore) addPrincipalInfos(ctx context.Context, m *types.Membership) (types.MembershipUser, error) {
+	var result types.MembershipUser
+
+	// pull principal infos from cache
+	infoMap, err := s.pCache.Map(ctx, []int64{m.CreatedBy, m.PrincipalID})
+	if err != nil {
+		return result, fmt.Errorf("failed to load membership principal infos: %w", err)
+	}
+
+	if user, ok := infoMap[m.PrincipalID]; ok {
+		result.Principal = *user
+	} else {
+		return result, fmt.Errorf("failed to find membership principal info: %w", err)
+	}
+
+	if addedBy, ok := infoMap[m.CreatedBy]; ok {
+		result.AddedBy = *addedBy
+	}
+
+	result.Membership = *m
+
+	return result, nil
+}
+
+func (s *MembershipStore) mapToMembershipUsers(ctx context.Context,
+	ms []*membershipPrincipal,
+) ([]types.MembershipUser, error) {
+	// collect all principal IDs
+	ids := make([]int64, 0, len(ms))
+	for _, m := range ms {
+		ids = append(ids, m.membership.CreatedBy)
+	}
+
+	// pull principal infos from cache
+	infoMap, err := s.pCache.Map(ctx, ids)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load membership principal infos: %w", err)
+	}
+
+	// attach the principal infos back to the slice items
+	res := make([]types.MembershipUser, len(ms))
+	for i, m := range ms {
+		res[i].Membership = mapToMembership(&m.membership)
+		res[i].Principal = mapToPrincipalInfo(&m.principalInfo)
+		if addedBy, ok := infoMap[m.membership.CreatedBy]; ok {
+			res[i].AddedBy = *addedBy
+		}
+	}
+
+	return res, nil
+}
+
+func (s *MembershipStore) mapToMembershipSpaces(ctx context.Context,
+	ms []*membershipSpace,
+) ([]types.MembershipSpace, error) {
+	// collect all principal IDs
+	ids := make([]int64, 0, len(ms))
+	for _, m := range ms {
+		ids = append(ids, m.membership.CreatedBy)
+	}
+
+	// pull principal infos from cache
+	infoMap, err := s.pCache.Map(ctx, ids)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load membership principal infos: %w", err)
+	}
+
+	// attach the principal infos back to the slice items
+	res := make([]types.MembershipSpace, len(ms))
+	for i, m := range ms {
+		res[i].Membership = mapToMembership(&m.membership)
+		res[i].Space = mapToSpace(&m.space)
+		if addedBy, ok := infoMap[m.membership.CreatedBy]; ok {
+			res[i].AddedBy = *addedBy
+		}
+	}
+
+	return res, nil
+}
diff --git a/internal/store/database/migrate/postgres/0019_create_table_memberships.down.sql b/internal/store/database/migrate/postgres/0019_create_table_memberships.down.sql
new file mode 100644
index 000000000..cb23bba6b
--- /dev/null
+++ b/internal/store/database/migrate/postgres/0019_create_table_memberships.down.sql
@@ -0,0 +1,2 @@
+DROP TABLE memberships;
+
diff --git a/internal/store/database/migrate/postgres/0019_create_table_memberships.up.sql b/internal/store/database/migrate/postgres/0019_create_table_memberships.up.sql
new file mode 100644
index 000000000..e0b9ef5b7
--- /dev/null
+++ b/internal/store/database/migrate/postgres/0019_create_table_memberships.up.sql
@@ -0,0 +1,21 @@
+CREATE TABLE memberships (
+ membership_space_id INTEGER NOT NULL
+,membership_principal_id INTEGER NOT NULL
+,membership_created_by INTEGER NOT NULL
+,membership_created BIGINT NOT NULL
+,membership_updated BIGINT NOT NULL
+,membership_role TEXT NOT NULL
+,CONSTRAINT pk_memberships PRIMARY KEY (membership_space_id, membership_principal_id)
+,CONSTRAINT fk_membership_space_id FOREIGN KEY (membership_space_id)
+    REFERENCES spaces (space_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+,CONSTRAINT fk_membership_principal_id FOREIGN KEY (membership_principal_id)
+    REFERENCES principals (principal_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+,CONSTRAINT fk_membership_created_by FOREIGN KEY (membership_created_by)
+    REFERENCES principals (principal_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE NO ACTION
+);
diff --git a/internal/store/database/migrate/sqlite/0019_create_table_memberships.down.sql b/internal/store/database/migrate/sqlite/0019_create_table_memberships.down.sql
new file mode 100644
index 000000000..cb23bba6b
--- /dev/null
+++ b/internal/store/database/migrate/sqlite/0019_create_table_memberships.down.sql
@@ -0,0 +1,2 @@
+DROP TABLE memberships;
+
diff --git a/internal/store/database/migrate/sqlite/0019_create_table_memberships.up.sql b/internal/store/database/migrate/sqlite/0019_create_table_memberships.up.sql
new file mode 100644
index 000000000..e0b9ef5b7
--- /dev/null
+++ b/internal/store/database/migrate/sqlite/0019_create_table_memberships.up.sql
@@ -0,0 +1,21 @@
+CREATE TABLE memberships (
+ membership_space_id INTEGER NOT NULL
+,membership_principal_id INTEGER NOT NULL
+,membership_created_by INTEGER NOT NULL
+,membership_created BIGINT NOT NULL
+,membership_updated BIGINT NOT NULL
+,membership_role TEXT NOT NULL
+,CONSTRAINT pk_memberships PRIMARY KEY (membership_space_id, membership_principal_id)
+,CONSTRAINT fk_membership_space_id FOREIGN KEY (membership_space_id)
+    REFERENCES spaces (space_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+,CONSTRAINT fk_membership_principal_id FOREIGN KEY (membership_principal_id)
+    REFERENCES principals (principal_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+,CONSTRAINT fk_membership_created_by FOREIGN KEY (membership_created_by)
+    REFERENCES principals (principal_id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE NO ACTION
+);
diff --git a/internal/store/database/principal_info.go b/internal/store/database/principal_info.go
index a882e4598..4b9e5281e 100644
--- a/internal/store/database/principal_info.go
+++ b/internal/store/database/principal_info.go
@@ -11,6 +11,7 @@ import (
 	"github.com/harness/gitness/store/database"
 	"github.com/harness/gitness/store/database/dbtx"
 	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
 
 	"github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
@@ -32,15 +33,25 @@ type PrincipalInfoView struct {
 
 const (
 	principalInfoCommonColumns = `
-		principal_id,
-		principal_uid,
-		principal_email,
-		principal_display_name,
-		principal_type,
-		principal_created,
-		principal_updated`
+		 principal_id
+		,principal_uid
+		,principal_email
+		,principal_display_name
+		,principal_type
+		,principal_created
+		,principal_updated`
 )
 
+type principalInfo struct {
+	ID          int64              `db:"principal_id"`
+	UID         string             `db:"principal_uid"`
+	DisplayName string             `db:"principal_display_name"`
+	Email       string             `db:"principal_email"`
+	Type        enum.PrincipalType `db:"principal_type"`
+	Created     int64              `db:"principal_created"`
+	Updated     int64              `db:"principal_updated"`
+}
+
 // Find returns a single principal info object by id from the `principals` database table.
 func (s *PrincipalInfoView) Find(ctx context.Context, id int64) (*types.PrincipalInfo, error) {
 	const sqlQuery = `
@@ -107,3 +118,15 @@ func (s *PrincipalInfoView) FindMany(ctx context.Context, ids []int64) ([]*types
 
 	return result, nil
 }
+
+func mapToPrincipalInfo(p *principalInfo) types.PrincipalInfo {
+	return types.PrincipalInfo{
+		ID:          p.ID,
+		UID:         p.UID,
+		DisplayName: p.DisplayName,
+		Email:       p.Email,
+		Type:        p.Type,
+		Created:     p.Created,
+		Updated:     p.Updated,
+	}
+}
diff --git a/internal/store/database/principal_test.go b/internal/store/database/principal_test.go
index c80cd15c4..5bb030cb0 100644
--- a/internal/store/database/principal_test.go
+++ b/internal/store/database/principal_test.go
@@ -104,7 +104,7 @@ func testUserDuplicate(store store.PrincipalStore) func(t *testing.T) {
 // and compares to the expected count.
 func testUserCount(store store.PrincipalStore) func(t *testing.T) {
 	return func(t *testing.T) {
-		got, err := store.CountUsers(context.Background())
+		got, err := store.CountUsers(context.Background(), &types.UserFilter{})
 		if err != nil {
 			t.Error(err)
 			return
diff --git a/internal/store/database/principal_user.go b/internal/store/database/principal_user.go
index 356215b76..de0177ff7 100644
--- a/internal/store/database/principal_user.go
+++ b/internal/store/database/principal_user.go
@@ -224,17 +224,26 @@ func (s *PrincipalStore) ListUsers(ctx context.Context, opts *types.UserFilter)
 	return s.mapDBUsers(dst), nil
 }
 
-// CountUsers returns a count of users.
-func (s *PrincipalStore) CountUsers(ctx context.Context) (int64, error) {
-	const sqlQuery = `
-		SELECT count(*)
-		FROM principals
-		WHERE principal_type = 'user'`
+// CountUsers returns a count of users matching the given filter.
+func (s *PrincipalStore) CountUsers(ctx context.Context, opts *types.UserFilter) (int64, error) {
+	stmt := database.Builder.
+		Select("count(*)").
+		From("principals").
+		Where("principal_type = 'user'")
+
+	if opts.Admin {
+		stmt = stmt.Where("principal_admin = ?", opts.Admin)
+	}
+
+	sql, args, err := stmt.ToSql()
+	if err != nil {
+		return 0, errors.Wrap(err, "Failed to convert query to sql")
+	}
 
 	db := dbtx.GetAccessor(ctx, s.db)
 
 	var count int64
-	err := db.QueryRowContext(ctx, sqlQuery).Scan(&count)
+	err = db.QueryRowContext(ctx, sql, args...).Scan(&count)
 	if err != nil {
 		return 0, database.ProcessSQLErrorf(err, "Failed executing count query")
 	}
diff --git a/internal/store/database/pullreq.go b/internal/store/database/pullreq.go
index 8ad4bbd44..dd95d9050 100644
--- a/internal/store/database/pullreq.go
+++ b/internal/store/database/pullreq.go
@@ -335,6 +335,36 @@ func (s *PullReqStore) UpdateActivitySeq(ctx context.Context, pr *types.PullReq)
 	})
 }
 
+// UpdateMergeCheckStatus updates the pull request's mergeability status
+// for all pr which target branch points to targetBranch.
+func (s *PullReqStore) UpdateMergeCheckStatus(
+	ctx context.Context,
+	targetRepo int64,
+	targetBranch string,
+	status enum.MergeCheckStatus,
+) error {
+	const query = `
+	UPDATE pullreqs
+	SET
+		 pullreq_updated = $1
+		,pullreq_merge_check_status = $2
+	WHERE pullreq_target_repo_id = $3 AND
+		  pullreq_target_branch = $4 AND
+		  pullreq_state not in ($5, $6)`
+
+	db := dbtx.GetAccessor(ctx, s.db)
+
+	updatedAt := time.Now()
+
+	_, err := db.ExecContext(ctx, query, updatedAt, status, targetRepo, targetBranch,
+		enum.PullReqStateClosed, enum.PullReqStateClosed)
+	if err != nil {
+		return database.ProcessSQLErrorf(err, "Failed to update mergeable status check %s in pull requests", status)
+	}
+
+	return nil
+}
+
 // Delete the pull request.
 func (s *PullReqStore) Delete(ctx context.Context, id int64) error {
 	const pullReqDelete = `DELETE FROM pullreqs WHERE pullreq_id = $1`
diff --git a/internal/store/database/space.go b/internal/store/database/space.go
index 904ca0f2e..36395aa41 100644
--- a/internal/store/database/space.go
+++ b/internal/store/database/space.go
@@ -86,7 +86,9 @@ func (s *SpaceStore) Find(ctx context.Context, id int64) (*types.Space, error) {
 		return nil, database.ProcessSQLErrorf(err, "Failed to find space")
 	}
 
-	return mapToSpace(dst), nil
+	result := mapToSpace(dst)
+
+	return &result, nil
 }
 
 // FindByRef finds the space using the spaceRef as either the id or the space path.
@@ -113,6 +115,10 @@ func (s *SpaceStore) FindByRef(ctx context.Context, spaceRef string) (*types.Spa
 
 // Create a new space.
 func (s *SpaceStore) Create(ctx context.Context, space *types.Space) error {
+	if space == nil {
+		return errors.New("space is nil")
+	}
+
 	const sqlQuery = `
 		INSERT INTO spaces (
 			space_version
@@ -134,14 +140,9 @@ func (s *SpaceStore) Create(ctx context.Context, space *types.Space) error {
 			,:space_updated
 		) RETURNING space_id`
 
-	dbSpace, err := mapToInternalSpace(space)
-	if err != nil {
-		return fmt.Errorf("failed to map space: %w", err)
-	}
-
 	db := dbtx.GetAccessor(ctx, s.db)
 
-	query, args, err := db.BindNamed(sqlQuery, dbSpace)
+	query, args, err := db.BindNamed(sqlQuery, mapToInternalSpace(space))
 	if err != nil {
 		return database.ProcessSQLErrorf(err, "Failed to bind space object")
 	}
@@ -153,8 +154,12 @@ func (s *SpaceStore) Create(ctx context.Context, space *types.Space) error {
 	return nil
 }
 
-// Updates the space details.
+// Update updates the space details.
 func (s *SpaceStore) Update(ctx context.Context, space *types.Space) error {
+	if space == nil {
+		return errors.New("space is nil")
+	}
+
 	const sqlQuery = `
 		UPDATE spaces
 		SET
@@ -166,10 +171,7 @@ func (s *SpaceStore) Update(ctx context.Context, space *types.Space) error {
 			,space_is_public	= :space_is_public
 		WHERE space_id = :space_id AND space_version = :space_version - 1`
 
-	dbSpace, err := mapToInternalSpace(space)
-	if err != nil {
-		return fmt.Errorf("failed to map space: %w", err)
-	}
+	dbSpace := mapToInternalSpace(space)
 
 	// update Version (used for optimistic locking) and Updated time
 	dbSpace.Version++
@@ -205,7 +207,8 @@ func (s *SpaceStore) Update(ctx context.Context, space *types.Space) error {
 // UpdateOptLock updates the space using the optimistic locking mechanism.
 func (s *SpaceStore) UpdateOptLock(ctx context.Context,
 	space *types.Space,
-	mutateFn func(space *types.Space) error) (*types.Space, error) {
+	mutateFn func(space *types.Space) error,
+) (*types.Space, error) {
 	for {
 		dup := *space
 
@@ -229,7 +232,7 @@ func (s *SpaceStore) UpdateOptLock(ctx context.Context,
 	}
 }
 
-// Deletes the space.
+// Delete deletes a space.
 func (s *SpaceStore) Delete(ctx context.Context, id int64) error {
 	const sqlQuery = `
 		DELETE FROM spaces
@@ -271,7 +274,7 @@ func (s *SpaceStore) Count(ctx context.Context, id int64, opts *types.SpaceFilte
 }
 
 // List returns a list of spaces under the parent space.
-func (s *SpaceStore) List(ctx context.Context, id int64, opts *types.SpaceFilter) ([]*types.Space, error) {
+func (s *SpaceStore) List(ctx context.Context, id int64, opts *types.SpaceFilter) ([]types.Space, error) {
 	stmt := database.Builder.
 		Select(spaceColumnsForJoin).
 		From("spaces").
@@ -310,7 +313,7 @@ func (s *SpaceStore) List(ctx context.Context, id int64, opts *types.SpaceFilter
 
 	db := dbtx.GetAccessor(ctx, s.db)
 
-	dst := []*space{}
+	var dst []*space
 	if err = db.SelectContext(ctx, &dst, sql, args...); err != nil {
 		return nil, database.ProcessSQLErrorf(err, "Failed executing custom list query")
 	}
@@ -318,8 +321,8 @@ func (s *SpaceStore) List(ctx context.Context, id int64, opts *types.SpaceFilter
 	return mapToSpaces(dst), nil
 }
 
-func mapToSpace(s *space) *types.Space {
-	res := &types.Space{
+func mapToSpace(s *space) types.Space {
+	res := types.Space{
 		ID:          s.ID,
 		Version:     s.Version,
 		UID:         s.UID,
@@ -339,21 +342,16 @@ func mapToSpace(s *space) *types.Space {
 	return res
 }
 
-func mapToSpaces(spaces []*space) []*types.Space {
-	res := make([]*types.Space, len(spaces))
+func mapToSpaces(spaces []*space) []types.Space {
+	res := make([]types.Space, len(spaces))
 	for i := range spaces {
 		res[i] = mapToSpace(spaces[i])
 	}
 	return res
 }
 
-func mapToInternalSpace(s *types.Space) (*space, error) {
-	// space comes from outside.
-	if s == nil {
-		return nil, fmt.Errorf("space is nil")
-	}
-
-	res := &space{
+func mapToInternalSpace(s *types.Space) space {
+	res := space{
 		ID:          s.ID,
 		Version:     s.Version,
 		UID:         s.UID,
@@ -371,5 +369,5 @@ func mapToInternalSpace(s *types.Space) (*space, error) {
 		res.ParentID = null.IntFrom(s.ParentID)
 	}
 
-	return res, nil
+	return res
 }
diff --git a/internal/store/database/wire.go b/internal/store/database/wire.go
index 4870f3d98..ff6a66870 100644
--- a/internal/store/database/wire.go
+++ b/internal/store/database/wire.go
@@ -24,6 +24,7 @@ var WireSet = wire.NewSet(
 	ProvideSpaceStore,
 	ProvideRepoStore,
 	ProvideRepoGitInfoView,
+	ProvideMembershipStore,
 	ProvideTokenStore,
 	ProvidePullReqStore,
 	ProvidePullReqActivityStore,
@@ -36,7 +37,7 @@ var WireSet = wire.NewSet(
 	ProvideReqCheckStore,
 )
 
-// helper function to setup the database by performing automated
+// migrator is helper function to set up the database by performing automated
 // database migration steps.
 func migrator(ctx context.Context, db *sqlx.DB) error {
 	return migrate.Migrate(ctx, db)
@@ -82,6 +83,13 @@ func ProvideRepoGitInfoView(db *sqlx.DB) store.RepoGitInfoView {
 	return NewRepoGitInfoView(db)
 }
 
+func ProvideMembershipStore(
+	db *sqlx.DB,
+	principalInfoCache store.PrincipalInfoCache,
+) store.MembershipStore {
+	return NewMembershipStore(db, principalInfoCache)
+}
+
 // ProvideTokenStore provides a token store.
 func ProvideTokenStore(db *sqlx.DB) store.TokenStore {
 	return NewTokenStore(db)
@@ -89,13 +97,15 @@ func ProvideTokenStore(db *sqlx.DB) store.TokenStore {
 
 // ProvidePullReqStore provides a pull request store.
 func ProvidePullReqStore(db *sqlx.DB,
-	principalInfoCache store.PrincipalInfoCache) store.PullReqStore {
+	principalInfoCache store.PrincipalInfoCache,
+) store.PullReqStore {
 	return NewPullReqStore(db, principalInfoCache)
 }
 
 // ProvidePullReqActivityStore provides a pull request activity store.
 func ProvidePullReqActivityStore(db *sqlx.DB,
-	principalInfoCache store.PrincipalInfoCache) store.PullReqActivityStore {
+	principalInfoCache store.PrincipalInfoCache,
+) store.PullReqActivityStore {
 	return NewPullReqActivityStore(db, principalInfoCache)
 }
 
@@ -111,7 +121,8 @@ func ProvidePullReqReviewStore(db *sqlx.DB) store.PullReqReviewStore {
 
 // ProvidePullReqReviewerStore provides a pull request reviewer store.
 func ProvidePullReqReviewerStore(db *sqlx.DB,
-	principalInfoCache store.PrincipalInfoCache) store.PullReqReviewerStore {
+	principalInfoCache store.PrincipalInfoCache,
+) store.PullReqReviewerStore {
 	return NewPullReqReviewerStore(db, principalInfoCache)
 }
 
diff --git a/internal/token/jwt.go b/internal/token/jwt.go
index 86e465350..db49243a3 100644
--- a/internal/token/jwt.go
+++ b/internal/token/jwt.go
@@ -27,12 +27,17 @@ type JWTClaims struct {
 
 // GenerateJWTForToken generates a jwt for a given token.
 func GenerateJWTForToken(token *types.Token, secret string) (string, error) {
+	var expiresAt int64
+	if token.ExpiresAt != nil {
+		expiresAt = *token.ExpiresAt
+	}
+
 	jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, JWTClaims{
 		jwt.StandardClaims{
 			Issuer: issuer,
 			// times required to be in sec not millisec
 			IssuedAt:  token.IssuedAt / 1000,
-			ExpiresAt: token.ExpiresAt / 1000,
+			ExpiresAt: expiresAt / 1000,
 		},
 		token.Type,
 		token.ID,
diff --git a/internal/token/token.go b/internal/token/token.go
index 401f41a55..b415adf28 100644
--- a/internal/token/token.go
+++ b/internal/token/token.go
@@ -12,6 +12,8 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 )
 
 const (
@@ -28,14 +30,14 @@ func CreateUserSession(ctx context.Context, tokenStore store.TokenStore,
 		principal,
 		principal,
 		uid,
-		userTokenLifeTime,
+		ptr.Duration(userTokenLifeTime),
 		enum.AccessGrantAll,
 	)
 }
 
 func CreatePAT(ctx context.Context, tokenStore store.TokenStore,
 	createdBy *types.Principal, createdFor *types.User,
-	uid string, lifetime time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
+	uid string, lifetime *time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
 	return Create(
 		ctx,
 		tokenStore,
@@ -50,7 +52,7 @@ func CreatePAT(ctx context.Context, tokenStore store.TokenStore,
 
 func CreateSAT(ctx context.Context, tokenStore store.TokenStore,
 	createdBy *types.Principal, createdFor *types.ServiceAccount,
-	uid string, lifetime time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
+	uid string, lifetime *time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
 	return Create(
 		ctx,
 		tokenStore,
@@ -65,9 +67,13 @@ func CreateSAT(ctx context.Context, tokenStore store.TokenStore,
 
 func Create(ctx context.Context, tokenStore store.TokenStore,
 	tokenType enum.TokenType, createdBy *types.Principal, createdFor *types.Principal,
-	uid string, lifetime time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
+	uid string, lifetime *time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
 	issuedAt := time.Now()
-	expiresAt := issuedAt.Add(lifetime)
+
+	var expiresAt *int64
+	if lifetime != nil {
+		expiresAt = ptr.Int64(issuedAt.Add(*lifetime).UnixMilli())
+	}
 
 	// create db entry first so we get the id.
 	token := types.Token{
@@ -75,7 +81,7 @@ func Create(ctx context.Context, tokenStore store.TokenStore,
 		UID:         uid,
 		PrincipalID: createdFor.ID,
 		IssuedAt:    issuedAt.UnixMilli(),
-		ExpiresAt:   expiresAt.UnixMilli(),
+		ExpiresAt:   expiresAt,
 		Grants:      grants,
 		CreatedBy:   createdBy.ID,
 	}
diff --git a/lock/memory.go b/lock/memory.go
index 25162a4b6..dd7870e9e 100644
--- a/lock/memory.go
+++ b/lock/memory.go
@@ -69,7 +69,7 @@ func (m *InMemory) NewMutex(key string, options ...Option) (Mutex, error) {
 	// https://github.com/go-redsync/redsync/blob/e1e5da6654c81a2069d6a360f1a31c21f05cd22d/mutex.go#LL81C4-L81C100
 	waitTime := config.Expiry
 	if config.TimeoutFactor > 0 {
-		waitTime *= time.Duration(int64(float64(config.Expiry) * config.TimeoutFactor))
+		waitTime = time.Duration(int64(float64(config.Expiry) * config.TimeoutFactor))
 	}
 
 	lock := inMemMutex{
diff --git a/mocks/mock_client.go b/mocks/mock_client.go
index 3216e04cb..b16a6490e 100644
--- a/mocks/mock_client.go
+++ b/mocks/mock_client.go
@@ -37,33 +37,33 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder {
 }
 
 // Login mocks base method.
-func (m *MockClient) Login(arg0 context.Context, arg1, arg2 string) (*types.TokenResponse, error) {
+func (m *MockClient) Login(arg0 context.Context, arg1 *user.LoginInput) (*types.TokenResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Login", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "Login", arg0, arg1)
 	ret0, _ := ret[0].(*types.TokenResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // Login indicates an expected call of Login.
-func (mr *MockClientMockRecorder) Login(arg0, arg1, arg2 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) Login(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Login", reflect.TypeOf((*MockClient)(nil).Login), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Login", reflect.TypeOf((*MockClient)(nil).Login), arg0, arg1)
 }
 
 // Register mocks base method.
-func (m *MockClient) Register(arg0 context.Context, arg1, arg2, arg3, arg4 string) (*types.TokenResponse, error) {
+func (m *MockClient) Register(arg0 context.Context, arg1 *user.RegisterInput) (*types.TokenResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Register", arg0, arg1, arg2, arg3, arg4)
+	ret := m.ctrl.Call(m, "Register", arg0, arg1)
 	ret0, _ := ret[0].(*types.TokenResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // Register indicates an expected call of Register.
-func (mr *MockClientMockRecorder) Register(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) Register(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockClient)(nil).Register), arg0, arg1, arg2, arg3, arg4)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockClient)(nil).Register), arg0, arg1)
 }
 
 // Self mocks base method.
diff --git a/mocks/mock_store.go b/mocks/mock_store.go
index 615be74a8..0af0bbc34 100644
--- a/mocks/mock_store.go
+++ b/mocks/mock_store.go
@@ -67,18 +67,18 @@ func (mr *MockPrincipalStoreMockRecorder) CountServices(arg0 interface{}) *gomoc
 }
 
 // CountUsers mocks base method.
-func (m *MockPrincipalStore) CountUsers(arg0 context.Context) (int64, error) {
+func (m *MockPrincipalStore) CountUsers(arg0 context.Context, arg1 *types.UserFilter) (int64, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "CountUsers", arg0)
+	ret := m.ctrl.Call(m, "CountUsers", arg0, arg1)
 	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CountUsers indicates an expected call of CountUsers.
-func (mr *MockPrincipalStoreMockRecorder) CountUsers(arg0 interface{}) *gomock.Call {
+func (mr *MockPrincipalStoreMockRecorder) CountUsers(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CountUsers", reflect.TypeOf((*MockPrincipalStore)(nil).CountUsers), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CountUsers", reflect.TypeOf((*MockPrincipalStore)(nil).CountUsers), arg0, arg1)
 }
 
 // CreateService mocks base method.
@@ -529,10 +529,10 @@ func (mr *MockSpaceStoreMockRecorder) FindByRef(arg0, arg1 interface{}) *gomock.
 }
 
 // List mocks base method.
-func (m *MockSpaceStore) List(arg0 context.Context, arg1 int64, arg2 *types.SpaceFilter) ([]*types.Space, error) {
+func (m *MockSpaceStore) List(arg0 context.Context, arg1 int64, arg2 *types.SpaceFilter) ([]types.Space, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "List", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*types.Space)
+	ret0, _ := ret[0].([]types.Space)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/store/database/util_sqlite.go b/store/database/util_sqlite.go
index 9eb47aef9..7c044fa57 100644
--- a/store/database/util_sqlite.go
+++ b/store/database/util_sqlite.go
@@ -15,7 +15,8 @@ import (
 func isSQLUniqueConstraintError(original error) bool {
 	var sqliteErr sqlite3.Error
 	if errors.As(original, &sqliteErr) {
-		return errors.Is(sqliteErr.ExtendedCode, sqlite3.ErrConstraintUnique)
+		return errors.Is(sqliteErr.ExtendedCode, sqlite3.ErrConstraintUnique) ||
+			errors.Is(sqliteErr.ExtendedCode, sqlite3.ErrConstraintPrimaryKey)
 	}
 
 	return false
diff --git a/types/check/token.go b/types/check/token.go
index 6621e4a97..a370f8be7 100644
--- a/types/check/token.go
+++ b/types/check/token.go
@@ -17,11 +17,22 @@ var (
 	ErrTokenLifeTimeOutOfBounds = &ValidationError{
 		"The life time of a token has to be between 1 day and 365 days.",
 	}
+	ErrTokenLifeTimeRequired = &ValidationError{
+		"The life time of a token is required.",
+	}
 )
 
 // TokenLifetime returns true if the lifetime is valid for a token.
-func TokenLifetime(lifetime time.Duration) error {
-	if lifetime < minTokenLifeTime || lifetime > maxTokenLifeTime {
+func TokenLifetime(lifetime *time.Duration, optional bool) error {
+	if lifetime == nil && !optional {
+		return ErrTokenLifeTimeRequired
+	}
+
+	if lifetime == nil {
+		return nil
+	}
+
+	if *lifetime < minTokenLifeTime || *lifetime > maxTokenLifeTime {
 		return ErrTokenLifeTimeOutOfBounds
 	}
 
diff --git a/types/config.go b/types/config.go
index 014b0cf55..b0ad4d2ba 100644
--- a/types/config.go
+++ b/types/config.go
@@ -14,7 +14,10 @@ type Config struct {
 	// NOTE: If the value is not provided the hostname of the machine is used.
 	InstanceID  string `envconfig:"GITNESS_INSTANCE_ID"`
 	Debug       bool   `envconfig:"GITNESS_DEBUG"`
-	Trace       bool   `envconfig:"GITNESS_TRACE"`
+	Trace       bool   `envconfig:"GITNESS_TRACE"`// GracefulShutdownTime defines the max time we wait when shutting down a server.
+	// 5min should be enough for most git clones to complete.
+	GracefulShutdownTime time.Duration `envconfig:"GITNESS_GRACEFUL_SHUTDOWN_TIME" default:"300s"`
+
 	AllowSignUp bool   `envconfig:"GITNESS_ALLOW_SIGNUP"`
 
 	Profiler struct {
diff --git a/types/enum/membership.go b/types/enum/membership.go
new file mode 100644
index 000000000..42a63d73b
--- /dev/null
+++ b/types/enum/membership.go
@@ -0,0 +1,46 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package enum
+
+import (
+	"strings"
+)
+
+// MembershipSort represents membership sort order.
+type MembershipSort int
+
+// Order enumeration.
+const (
+	MembershipSortNone MembershipSort = iota
+	MembershipSortName
+	MembershipSortCreated
+)
+
+// ParseMembershipSort parses the membership sort attribute string
+// and returns the equivalent enumeration.
+func ParseMembershipSort(s string) MembershipSort {
+	switch strings.ToLower(s) {
+	case name:
+		return MembershipSortName
+	case created, createdAt:
+		return MembershipSortCreated
+	default:
+		return MembershipSortNone
+	}
+}
+
+// String returns the string representation of the attribute.
+func (a MembershipSort) String() string {
+	switch a {
+	case MembershipSortName:
+		return name
+	case MembershipSortCreated:
+		return created
+	case MembershipSortNone:
+		return ""
+	default:
+		return undefined
+	}
+}
diff --git a/types/enum/membership_role.go b/types/enum/membership_role.go
new file mode 100644
index 000000000..f7888d2c2
--- /dev/null
+++ b/types/enum/membership_role.go
@@ -0,0 +1,80 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package enum
+
+import "golang.org/x/exp/slices"
+
+// MembershipRole represents the different level of space memberships (permission set).
+type MembershipRole string
+
+func (MembershipRole) Enum() []interface{}                      { return toInterfaceSlice(MembershipRoles) }
+func (m MembershipRole) Sanitize() (MembershipRole, bool)       { return Sanitize(m, GetAllMembershipRoles) }
+func GetAllMembershipRoles() ([]MembershipRole, MembershipRole) { return MembershipRoles, "" }
+
+var MembershipRoles = sortEnum([]MembershipRole{
+	MembershipRoleReader,
+	MembershipRoleExecutor,
+	MembershipRoleContributor,
+	MembershipRoleSpaceOwner,
+})
+
+var membershipRoleReaderPermissions = slices.Clip(slices.Insert([]Permission{}, 0,
+	PermissionRepoView,
+	PermissionSpaceView,
+	PermissionServiceAccountView,
+))
+
+var membershipRoleExecutorPermissions = slices.Clip(slices.Insert(membershipRoleReaderPermissions, 0,
+	PermissionCommitCheckReport,
+))
+
+var membershipRoleContributorPermissions = slices.Clip(slices.Insert(membershipRoleReaderPermissions, 0,
+	PermissionRepoPush,
+))
+
+var membershipRoleSpaceOwnerPermissions = slices.Clip(slices.Insert(membershipRoleReaderPermissions, 0,
+	PermissionRepoEdit,
+	PermissionRepoDelete,
+	PermissionRepoPush,
+	PermissionCommitCheckReport,
+
+	PermissionSpaceEdit,
+	PermissionSpaceCreate,
+	PermissionSpaceDelete,
+
+	PermissionServiceAccountCreate,
+	PermissionServiceAccountEdit,
+	PermissionServiceAccountDelete,
+))
+
+func init() {
+	slices.Sort(membershipRoleReaderPermissions)
+	slices.Sort(membershipRoleExecutorPermissions)
+	slices.Sort(membershipRoleContributorPermissions)
+	slices.Sort(membershipRoleSpaceOwnerPermissions)
+}
+
+// Permissions returns the list of permissions for the role.
+func (m MembershipRole) Permissions() []Permission {
+	switch m {
+	case MembershipRoleReader:
+		return membershipRoleReaderPermissions
+	case MembershipRoleExecutor:
+		return membershipRoleExecutorPermissions
+	case MembershipRoleContributor:
+		return membershipRoleContributorPermissions
+	case MembershipRoleSpaceOwner:
+		return membershipRoleSpaceOwnerPermissions
+	default:
+		return nil
+	}
+}
+
+const (
+	MembershipRoleReader      MembershipRole = "reader"
+	MembershipRoleExecutor    MembershipRole = "executor"
+	MembershipRoleContributor MembershipRole = "contributor"
+	MembershipRoleSpaceOwner  MembershipRole = "space_owner"
+)
diff --git a/types/enum/permission.go b/types/enum/permission.go
index 1a3302156..6824f035a 100644
--- a/types/enum/permission.go
+++ b/types/enum/permission.go
@@ -47,7 +47,7 @@ const (
 	PermissionUserView      Permission = "user_view"
 	PermissionUserEdit      Permission = "user_edit"
 	PermissionUserDelete    Permission = "user_delete"
-	PermissionUserEditAdmin Permission = "user_editadmin"
+	PermissionUserEditAdmin Permission = "user_editAdmin"
 )
 
 const (
@@ -68,7 +68,7 @@ const (
 	PermissionServiceView      Permission = "service_view"
 	PermissionServiceEdit      Permission = "service_edit"
 	PermissionServiceDelete    Permission = "service_delete"
-	PermissionServiceEditAdmin Permission = "service_editadmin"
+	PermissionServiceEditAdmin Permission = "service_editAdmin"
 )
 
 const (
diff --git a/types/enum/user_test.go b/types/enum/user_test.go
index cc0845499..010ccd5c3 100644
--- a/types/enum/user_test.go
+++ b/types/enum/user_test.go
@@ -11,7 +11,7 @@ func TestParseUserAttr(t *testing.T) {
 		text string
 		want UserAttr
 	}{
-		{"id", UserAttrUID},
+		{"uid", UserAttrUID},
 		{"name", UserAttrName},
 		{"email", UserAttrEmail},
 		{"created", UserAttrCreated},
diff --git a/types/membership.go b/types/membership.go
new file mode 100644
index 000000000..e8a908c23
--- /dev/null
+++ b/types/membership.go
@@ -0,0 +1,49 @@
+// Copyright 2022 Harness Inc. All rights reserved.
+// Use of this source code is governed by the Polyform Free Trial License
+// that can be found in the LICENSE.md file for this repository.
+
+package types
+
+import (
+	"github.com/harness/gitness/types/enum"
+)
+
+// MembershipKey can be used as a key for finding a user's space membership info.
+type MembershipKey struct {
+	SpaceID     int64
+	PrincipalID int64
+}
+
+// Membership represents a user's membership of a space.
+type Membership struct {
+	MembershipKey `json:"-"`
+
+	CreatedBy int64 `json:"-"`
+	Created   int64 `json:"created"`
+	Updated   int64 `json:"updated"`
+
+	Role enum.MembershipRole `json:"role"`
+}
+
+// MembershipUser adds user info to the Membership data.
+type MembershipUser struct {
+	Membership
+	Principal PrincipalInfo `json:"principal"`
+	AddedBy   PrincipalInfo `json:"added_by"`
+}
+
+// MembershipSpace adds space info to the Membership data.
+type MembershipSpace struct {
+	Membership
+	Space   Space         `json:"space"`
+	AddedBy PrincipalInfo `json:"added_by"`
+}
+
+// MembershipFilter holds membership query parameters.
+type MembershipFilter struct {
+	Page  int                 `json:"page"`
+	Size  int                 `json:"size"`
+	Query string              `json:"query"`
+	Sort  enum.MembershipSort `json:"sort"`
+	Order enum.Order          `json:"order"`
+}
diff --git a/types/token.go b/types/token.go
index c73447cd6..80b65dfac 100644
--- a/types/token.go
+++ b/types/token.go
@@ -11,14 +11,16 @@ import (
 // Represents server side infos stored for tokens we distribute.
 type Token struct {
 	// TODO: int64 ID doesn't match DB
-	ID          int64            `db:"token_id"                 json:"-"`
-	PrincipalID int64            `db:"token_principal_id"       json:"principal_id"`
-	Type        enum.TokenType   `db:"token_type"               json:"type"`
-	UID         string           `db:"token_uid"                json:"uid"`
-	ExpiresAt   int64            `db:"token_expires_at"         json:"expires_at"`
-	IssuedAt    int64            `db:"token_issued_at"          json:"issued_at"`
-	Grants      enum.AccessGrant `db:"token_grants"             json:"grants"`
-	CreatedBy   int64            `db:"token_created_by"         json:"created_by"`
+	ID          int64          `db:"token_id"                 json:"-"`
+	PrincipalID int64          `db:"token_principal_id"       json:"principal_id"`
+	Type        enum.TokenType `db:"token_type"               json:"type"`
+	UID         string         `db:"token_uid"                json:"uid"`
+	// ExpiresAt is an optional unix time that if specified restricts the validity of a token.
+	ExpiresAt *int64 `db:"token_expires_at"         json:"expires_at,omitempty"`
+	// IssuedAt is the unix time at which the token was issued.
+	IssuedAt  int64            `db:"token_issued_at"          json:"issued_at"`
+	Grants    enum.AccessGrant `db:"token_grants"             json:"grants"`
+	CreatedBy int64            `db:"token_created_by"         json:"created_by"`
 }
 
 // TokenResponse is returned as part of token creation for PAT / SAT / User Session.
diff --git a/types/user.go b/types/user.go
index a3881fa72..2afe5aa22 100644
--- a/types/user.go
+++ b/types/user.go
@@ -42,6 +42,7 @@ type (
 		Size  int           `json:"size"`
 		Sort  enum.UserAttr `json:"sort"`
 		Order enum.Order    `json:"order"`
+		Admin bool          `json:"admin"`
 	}
 )
 
diff --git a/web/config/moduleFederation.config.js b/web/config/moduleFederation.config.js
index 384ba5d64..8b4f0ccb3 100644
--- a/web/config/moduleFederation.config.js
+++ b/web/config/moduleFederation.config.js
@@ -37,7 +37,8 @@ module.exports = {
     './Settings': './src/pages/RepositorySettings/RepositorySettings.tsx',
     './Webhooks': './src/pages/Webhooks/Webhooks.tsx',
     './WebhookNew': './src/pages/WebhookNew/WebhookNew.tsx',
-    './WebhookDetails': './src/pages/WebhookDetails/WebhookDetails.tsx'
+    './WebhookDetails': './src/pages/WebhookDetails/WebhookDetails.tsx',
+    './NewRepoModalButton': './src/components/NewRepoModalButton/NewRepoModalButton.tsx'
   },
   shared: {
     formik: packageJSON.dependencies['formik'],
diff --git a/web/config/webpack.common.js b/web/config/webpack.common.js
index c71e03d8a..c96556268 100644
--- a/web/config/webpack.common.js
+++ b/web/config/webpack.common.js
@@ -12,9 +12,7 @@ const { RetryChunkLoadPlugin } = require('webpack-retry-chunk-load-plugin')
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
 const moduleFederationConfig = require('./moduleFederation.config')
 const CONTEXT = process.cwd()
-
 const DEV = process.env.NODE_ENV === 'development'
-const ON_PREM = `${process.env.ON_PREM}` === 'true'
 
 module.exports = {
   target: 'web',
@@ -159,8 +157,7 @@ module.exports = {
     new ModuleFederationPlugin(moduleFederationConfig),
     new DefinePlugin({
       'process.env': '{}', // required for @blueprintjs/core
-      __DEV__: DEV,
-      __ON_PREM__: ON_PREM
+      __DEV__: DEV
     }),
     new GenerateStringTypesPlugin(),
     new RetryChunkLoadPlugin({
diff --git a/web/config/webpack.prod.js b/web/config/webpack.prod.js
index 8d3a4816f..162fc1da8 100644
--- a/web/config/webpack.prod.js
+++ b/web/config/webpack.prod.js
@@ -1,15 +1,17 @@
 const { merge } = require('webpack-merge')
+const path = require('path')
 const HTMLWebpackPlugin = require('html-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const { DefinePlugin } = require('webpack')
 
 const commonConfig = require('./webpack.common')
-
-const ON_PREM = `${process.env.ON_PREM}` === 'true'
+const CONTEXT = process.cwd()
 
 const prodConfig = {
+  context: CONTEXT,
+  entry: path.resolve(CONTEXT, '/src/index.tsx'),
   mode: 'production',
-  devtool: 'source-map',
+  devtool: process.env.ENABLE_SOURCE_MAP ? 'source-map' : false,
   output: {
     filename: '[name].[contenthash:6].js',
     chunkFilename: '[name].[id].[contenthash:6].js'
@@ -39,9 +41,7 @@ const prodConfig = {
       filename: 'index.html',
       favicon: 'src/favicon.svg',
       minify: false,
-      templateParameters: {
-        __ON_PREM__: ON_PREM
-      }
+      templateParameters: {}
     })
   ]
 }
diff --git a/web/dist.go b/web/dist.go
index 0b54c4836..58adb79c5 100644
--- a/web/dist.go
+++ b/web/dist.go
@@ -1,7 +1,3 @@
-// Copyright 2022 Harness Inc. All rights reserved.
-// Use of this source code is governed by the Polyform Free Trial License
-// that can be found in the LICENSE.md file for this repository.
-
 //go:build !proxy
 // +build !proxy
 
diff --git a/web/src/App.module.scss b/web/src/App.module.scss
index 08c0d2950..1e9464c87 100644
--- a/web/src/App.module.scss
+++ b/web/src/App.module.scss
@@ -1,3 +1,5 @@
+@import 'src/utils/vars';
+
 /*
  * NOTE: Styles in this file are loaded in both standalone and embedded
  * versions. Be careful! Don't introduce global states that could be conflict
@@ -5,10 +7,7 @@
  */
 
 .main {
-  --nav-item-width: var(--main-nav-width, 88px);
-  --nav-item-height: 80px;
-  --nav-menu-width: 184px;
-  --nav-width: calc(var(--nav-item-width) + var(--nav-menu-width));
+  @include vars;
 
   &.fullPage {
     height: 100%;
@@ -59,5 +58,9 @@
     .Resizer.disabled:hover {
       border-color: transparent;
     }
+
+    div[data-testid='page-body'] > div[data-testid='page-error'] {
+      height: 80vh !important;
+    }
   }
 }
diff --git a/web/src/AppContext.tsx b/web/src/AppContext.tsx
index 5236d4c03..e07a1250d 100644
--- a/web/src/AppContext.tsx
+++ b/web/src/AppContext.tsx
@@ -4,6 +4,7 @@ import { useGet } from 'restful-react'
 import type { AppProps } from 'AppProps'
 import { routes } from 'RouteDefinitions'
 import type { TypesUser } from 'services/code'
+import { useAPIToken } from 'hooks/useAPIToken'
 
 interface AppContextProps extends AppProps {
   setAppContext: (value: Partial<AppProps>) => void
@@ -33,7 +34,11 @@ export const AppContextProvider: React.FC<{ value: AppProps }> = React.memo(func
   value: initialValue,
   children
 }) {
-  const { data: currentUser = defaultCurrentUser } = useGet({ path: '/api/v1/user' })
+  const [token, setToken] = useAPIToken()
+  const { data: currentUser = defaultCurrentUser, error } = useGet({
+    path: '/api/v1/user',
+    lazy: initialValue.standalone && !token
+  })
   const [appStates, setAppStates] = useState<AppProps>(initialValue)
 
   useEffect(() => {
@@ -42,6 +47,12 @@ export const AppContextProvider: React.FC<{ value: AppProps }> = React.memo(func
     }
   }, [initialValue, appStates])
 
+  useEffect(() => {
+    if (initialValue.standalone && error) {
+      setToken('')
+    }
+  }, [initialValue.standalone, error, setToken])
+
   return (
     <AppContext.Provider
       value={{
diff --git a/web/src/AppUtils.ts b/web/src/AppUtils.ts
index 21dcbc522..1b507b384 100644
--- a/web/src/AppUtils.ts
+++ b/web/src/AppUtils.ts
@@ -1,3 +1,5 @@
+import { routes } from 'RouteDefinitions'
+
 /**
  * Handle 401 error from API.
  *
@@ -7,8 +9,7 @@
  * Mostly, the implementation of this function is just a redirection to signin page.
  */
 export function handle401() {
-  // eslint-disable-next-line no-console
-  console.error('TODO: Handle 401 error...')
+  window.location.href = window.location.origin + routes.toSignIn()
 }
 
 /**
diff --git a/web/src/RouteDefinitions.ts b/web/src/RouteDefinitions.ts
index a245affa2..c0ea8f453 100644
--- a/web/src/RouteDefinitions.ts
+++ b/web/src/RouteDefinitions.ts
@@ -18,7 +18,7 @@ export interface CODEQueryProps {
 }
 
 export const pathProps: Readonly<Omit<Required<CODEProps>, 'repoPath' | 'branch' | 'tags'>> = {
-  space: ':space',
+  space: ':space*',
   repoName: ':repoName',
   gitRef: ':gitRef*',
   resourcePath: ':resourcePath*',
@@ -34,7 +34,10 @@ export interface CODERoutes {
   toRegister: () => string
 
   toCODEHome: () => string
-  toCODESpaces: () => string
+
+  toCODESpaceAccessControl: (args: Required<Pick<CODEProps, 'space'>>) => string
+  toCODESpaceSettings: (args: Required<Pick<CODEProps, 'space'>>) => string
+
   toCODEGlobalSettings: () => string
   toCODEUsers: () => string
   toCODEUserProfile: () => string
@@ -66,7 +69,10 @@ export const routes: CODERoutes = {
   toRegister: (): string => '/register',
 
   toCODEHome: () => `/`,
-  toCODESpaces: () => `/spaces`,
+
+  toCODESpaceAccessControl: ({ space }) => `/access-control/${space}`,
+  toCODESpaceSettings: ({ space }) => `/settings/${space}`,
+
   toCODEGlobalSettings: () => '/settings',
   toCODEUsers: () => '/users',
   toCODEUserProfile: () => '/profile',
diff --git a/web/src/RouteDestinations.tsx b/web/src/RouteDestinations.tsx
index 041f0642d..667d5a8d4 100644
--- a/web/src/RouteDestinations.tsx
+++ b/web/src/RouteDestinations.tsx
@@ -5,14 +5,10 @@ import { SignUp } from 'pages/SignUp/SignUp'
 import Repository from 'pages/Repository/Repository'
 import { routes, pathProps } from 'RouteDefinitions'
 import RepositoriesListing from 'pages/RepositoriesListing/RepositoriesListing'
-import Spaces from 'pages/Spaces/Spaces'
-
-import { LayoutWithSideMenu, LayoutWithSideNav } from 'layouts/layout'
-import { GlobalSettingsMenu } from 'layouts/menu/GlobalSettingsMenu'
-import { RepositoryMenu } from 'layouts/menu/RepositoryMenu'
-import { AdminMenu } from 'layouts/menu/AdminMenu'
+import { LayoutWithSideNav, LayoutWithoutSideNav } from 'layouts/layout'
 import RepositoryFileEdit from 'pages/RepositoryFileEdit/RepositoryFileEdit'
 import RepositoryCommits from 'pages/RepositoryCommits/RepositoryCommits'
+import RepositoryCommit from 'pages/RepositoryCommit/RepositoryCommit'
 import RepositoryBranches from 'pages/RepositoryBranches/RepositoryBranches'
 import RepositoryTags from 'pages/RepositoryTags/RepositoryTags'
 import Compare from 'pages/Compare/Compare'
@@ -26,24 +22,38 @@ import UsersListing from 'pages/UsersListing/UsersListing'
 import Home from 'pages/Home/Home'
 import UserProfile from 'pages/UserProfile/UserProfile'
 import ChangePassword from 'pages/ChangePassword/ChangePassword'
+import SpaceAccessControl from 'pages/SpaceAccessControl/SpaceAccessControl'
+import SpaceSettings from 'pages/SpaceSettings/SpaceSettings'
+import { useStrings } from 'framework/strings'
 
 export const RouteDestinations: React.FC = React.memo(function RouteDestinations() {
+  const { getString } = useStrings()
   const repoPath = `${pathProps.space}/${pathProps.repoName}`
 
   return (
     <BrowserRouter>
       <Switch>
         <Route path={routes.toSignIn()}>
-          <SignIn />
+          <LayoutWithoutSideNav title={getString('pageTitle.signin')}>
+            <SignIn />
+          </LayoutWithoutSideNav>
         </Route>
 
         <Route path={routes.toRegister()}>
-          <SignUp />
+          <LayoutWithoutSideNav title={getString('pageTitle.register')}>
+            <SignUp />
+          </LayoutWithoutSideNav>
         </Route>
 
-        <Route path={routes.toCODESpaces()} exact>
-          <LayoutWithSideNav>
-            <Spaces />
+        <Route path={routes.toCODESpaceAccessControl({ space: pathProps.space })} exact>
+          <LayoutWithSideNav title={getString('pageTitle.accessControl')}>
+            <SpaceAccessControl />
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route path={routes.toCODESpaceSettings({ space: pathProps.space })} exact>
+          <LayoutWithSideNav title={getString('pageTitle.spaceSettings')}>
+            <SpaceSettings />
           </LayoutWithSideNav>
         </Route>
 
@@ -52,9 +62,33 @@ export const RouteDestinations: React.FC = React.memo(function RouteDestinations
             repoPath,
             diffRefs: pathProps.diffRefs
           })}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.compare')}>
             <Compare />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route path={[routes.toCODEHome()]} exact>
+          <LayoutWithSideNav title={getString('pageTitle.home')}>
+            <Home />
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route path={routes.toCODEUsers()}>
+          <LayoutWithSideNav title={getString('pageTitle.users')}>
+            <UsersListing />
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route path={routes.toCODEUserProfile()} exact>
+          <LayoutWithSideNav title={getString('pageTitle.userProfile')}>
+            <UserProfile />
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route path={routes.toCODEUserChangePassword()} exact>
+          <LayoutWithSideNav title={getString('pageTitle.changePassword')}>
+            <ChangePassword />
+          </LayoutWithSideNav>
         </Route>
 
         <Route
@@ -70,21 +104,21 @@ export const RouteDestinations: React.FC = React.memo(function RouteDestinations
             })
           ]}
           exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.pullRequest')}>
             <PullRequest />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODEPullRequests({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.pullRequests')}>
             <PullRequests />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODEWebhookNew({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.createWebhook')}>
             <WebhookNew />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route
@@ -92,27 +126,37 @@ export const RouteDestinations: React.FC = React.memo(function RouteDestinations
             repoPath,
             webhookId: pathProps.webhookId
           })}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.webhookDetail')}>
             <WebhookDetails />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODEWebhooks({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.webhooks')}>
             <Webhooks />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODESettings({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.repositorySettings')}>
             <RepositorySettings />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODERepositories({ space: pathProps.space })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.repositories')}>
             <RepositoriesListing />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
+        </Route>
+
+        <Route
+          path={routes.toCODECommit({
+            repoPath,
+            commitRef: pathProps.commitRef
+          })}>
+          <LayoutWithSideNav title={getString('pageTitle.commits')}>
+            <RepositoryCommit />
+          </LayoutWithSideNav>
         </Route>
 
         <Route
@@ -120,100 +164,68 @@ export const RouteDestinations: React.FC = React.memo(function RouteDestinations
             repoPath,
             commitRef: pathProps.commitRef
           })}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.commits')}>
             <RepositoryCommits />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODEBranches({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.branches')}>
             <RepositoryBranches />
-          </LayoutWithSideMenu>
+          </LayoutWithSideNav>
         </Route>
 
         <Route path={routes.toCODETags({ repoPath })} exact>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
+          <LayoutWithSideNav title={getString('pageTitle.tags')}>
             <RepositoryTags />
-          </LayoutWithSideMenu>
-        </Route>
-
-        <Route
-          path={routes.toCODEFileEdit({
-            repoPath,
-            gitRef: pathProps.gitRef,
-            resourcePath: pathProps.resourcePath
-          })}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
-            <RepositoryFileEdit />
-          </LayoutWithSideMenu>
-        </Route>
-
-        <Route
-          path={[
-            routes.toCODERepository({
-              repoPath,
-              gitRef: pathProps.gitRef,
-              resourcePath: pathProps.resourcePath
-            }),
-            routes.toCODERepository({
-              repoPath,
-              gitRef: pathProps.gitRef
-            }),
-            routes.toCODERepository({ repoPath })
-          ]}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
-            <Repository />
-          </LayoutWithSideMenu>
-        </Route>
-
-        <Route
-          path={routes.toCODEFileEdit({
-            repoPath,
-            gitRef: pathProps.gitRef,
-            resourcePath: pathProps.resourcePath
-          })}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
-            <RepositoryFileEdit />
-          </LayoutWithSideMenu>
-        </Route>
-
-        <Route
-          path={[
-            routes.toCODERepository({
-              repoPath,
-              gitRef: pathProps.gitRef,
-              resourcePath: pathProps.resourcePath
-            }),
-            routes.toCODERepository({
-              repoPath,
-              gitRef: pathProps.gitRef
-            }),
-            routes.toCODERepository({ repoPath })
-          ]}>
-          <LayoutWithSideMenu menu={<RepositoryMenu />}>
-            <Repository />
-          </LayoutWithSideMenu>
-        </Route>
-
-        <Route path={[routes.toCODEHome()]} exact>
-          <LayoutWithSideNav>
-            <Home />
           </LayoutWithSideNav>
         </Route>
-        <Route path={routes.toCODEUsers()}>
-          <LayoutWithSideMenu menu={<AdminMenu />}>
-            <UsersListing />
-          </LayoutWithSideMenu>
+
+        <Route
+          path={routes.toCODEFileEdit({
+            repoPath,
+            gitRef: pathProps.gitRef,
+            resourcePath: pathProps.resourcePath
+          })}>
+          <LayoutWithSideNav title={getString('pageTitle.editFile')}>
+            <RepositoryFileEdit />
+          </LayoutWithSideNav>
         </Route>
-        <Route path={routes.toCODEUserProfile()} exact>
-          <LayoutWithSideMenu menu={<GlobalSettingsMenu />}>
-            <UserProfile />
-          </LayoutWithSideMenu>
+
+        <Route
+          path={[
+            routes.toCODERepository({
+              repoPath,
+              gitRef: pathProps.gitRef,
+              resourcePath: pathProps.resourcePath
+            }),
+            routes.toCODERepository({
+              repoPath,
+              gitRef: pathProps.gitRef
+            }),
+            routes.toCODERepository({ repoPath })
+          ]}>
+          <LayoutWithSideNav title={getString('pageTitle.repository')}>
+            <Repository />
+          </LayoutWithSideNav>
         </Route>
-        <Route path={routes.toCODEUserChangePassword()} exact>
-          <LayoutWithSideMenu menu={<GlobalSettingsMenu />}>
-            <ChangePassword />
-          </LayoutWithSideMenu>
+
+        <Route
+          path={[
+            routes.toCODERepository({
+              repoPath,
+              gitRef: pathProps.gitRef,
+              resourcePath: pathProps.resourcePath
+            }),
+            routes.toCODERepository({
+              repoPath,
+              gitRef: pathProps.gitRef
+            }),
+            routes.toCODERepository({ repoPath })
+          ]}>
+          <LayoutWithSideNav title={getString('pageTitle.repository')}>
+            <Repository />
+          </LayoutWithSideNav>
         </Route>
       </Switch>
     </BrowserRouter>
diff --git a/web/src/components/BranchTagSelect/BranchTagSelect.module.scss b/web/src/components/BranchTagSelect/BranchTagSelect.module.scss
index 23d84233d..4ebf838fa 100644
--- a/web/src/components/BranchTagSelect/BranchTagSelect.module.scss
+++ b/web/src/components/BranchTagSelect/BranchTagSelect.module.scss
@@ -1,3 +1,9 @@
+html[class=''] {
+  .button:focus {
+    --border: 1px solid var(--primary-7) !important;
+  }
+}
+
 .button {
   --border: 1px solid var(--grey-200) !important;
   --background-color-active: var(--white) !important;
diff --git a/web/src/components/BranchTagSelect/BranchTagSelect.tsx b/web/src/components/BranchTagSelect/BranchTagSelect.tsx
index ef0dd1d99..0894d8a3c 100644
--- a/web/src/components/BranchTagSelect/BranchTagSelect.tsx
+++ b/web/src/components/BranchTagSelect/BranchTagSelect.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useEffect, useMemo, useRef, useState } from 'react'
 import { Classes, Icon as BPIcon, Menu, MenuItem, PopoverPosition } from '@blueprintjs/core'
 import {
diff --git a/web/src/components/Changes/Changes.tsx b/web/src/components/Changes/Changes.tsx
index 0e7c28879..f5bf3a9b8 100644
--- a/web/src/components/Changes/Changes.tsx
+++ b/web/src/components/Changes/Changes.tsx
@@ -76,8 +76,8 @@ export const Changes: React.FC<ChangesProps> = ({
     refetch,
     response
   } = useGet<string>({
-    path: `/api/v1/repos/${repoMetadata?.path}/+/${
-      pullRequestMetadata ? `pullreq/${pullRequestMetadata.number}/diff` : `compare/${targetBranch}...${sourceBranch}`
+    path: `/api/v1/repos/${repoMetadata?.path}/+/compare/${
+      pullRequestMetadata ? `${pullRequestMetadata.merge_base_sha}...${pullRequestMetadata.source_sha}` : `${targetBranch}...${sourceBranch}`
     }`,
     lazy: !targetBranch || !sourceBranch
   })
diff --git a/web/src/components/CommitModalButton/CommitModalButton.tsx b/web/src/components/CommitModalButton/CommitModalButton.tsx
index fdf39a313..9e0c73ba9 100644
--- a/web/src/components/CommitModalButton/CommitModalButton.tsx
+++ b/web/src/components/CommitModalButton/CommitModalButton.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useState } from 'react'
 import { Dialog, Intent } from '@blueprintjs/core'
 import * as yup from 'yup'
diff --git a/web/src/components/CommitsView/CommitsView.tsx b/web/src/components/CommitsView/CommitsView.tsx
index dde8ba5a5..17a3053a1 100644
--- a/web/src/components/CommitsView/CommitsView.tsx
+++ b/web/src/components/CommitsView/CommitsView.tsx
@@ -187,7 +187,12 @@ export function CommitsView({
             <ThreadSection
               key={date}
               title={
-                <Text icon={CodeIcon.Commit} iconProps={{ size: 20 }} color={Color.GREY_500} className={css.label}>
+                <Text
+                  padding={{ top: 'small', bottom: 'small' }}
+                  icon={CodeIcon.Commit}
+                  iconProps={{ size: 20 }}
+                  color={Color.GREY_500}
+                  className={css.label}>
                   {getString('commitsOn', { date })}
                 </Text>
               }>
diff --git a/web/src/components/CreateBranchModal/CreateBranchModal.tsx b/web/src/components/CreateBranchModal/CreateBranchModal.tsx
index 05a4ee719..1a6bf593f 100644
--- a/web/src/components/CreateBranchModal/CreateBranchModal.tsx
+++ b/web/src/components/CreateBranchModal/CreateBranchModal.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useCallback, useState } from 'react'
 import { Dialog, Intent } from '@blueprintjs/core'
 import * as yup from 'yup'
diff --git a/web/src/components/CreateTagModal/CreateTagModal.tsx b/web/src/components/CreateTagModal/CreateTagModal.tsx
index a37c8a39c..ed700df9a 100644
--- a/web/src/components/CreateTagModal/CreateTagModal.tsx
+++ b/web/src/components/CreateTagModal/CreateTagModal.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useCallback, useState } from 'react'
 import { Dialog, Intent } from '@blueprintjs/core'
 import * as yup from 'yup'
diff --git a/web/src/components/GitnessLogo/GitnessLogo.module.scss b/web/src/components/GitnessLogo/GitnessLogo.module.scss
new file mode 100644
index 000000000..d99db0b26
--- /dev/null
+++ b/web/src/components/GitnessLogo/GitnessLogo.module.scss
@@ -0,0 +1,20 @@
+.main {
+  margin: var(--spacing-large) var(--spacing-large) 0 !important;
+  padding-bottom: 6px !important;
+
+  > a {
+    display: block;
+  }
+
+  .layout {
+    display: inline-flex !important;
+    align-items: center !important;
+  }
+
+  .text {
+    font-size: 20px;
+    font-style: normal;
+    font-weight: 600;
+    color: var(--black);
+  }
+}
diff --git a/web/src/pages/Spaces/Spaces.module.scss.d.ts b/web/src/components/GitnessLogo/GitnessLogo.module.scss.d.ts
similarity index 67%
rename from web/src/pages/Spaces/Spaces.module.scss.d.ts
rename to web/src/components/GitnessLogo/GitnessLogo.module.scss.d.ts
index 393b0bb14..a02e77e93 100644
--- a/web/src/pages/Spaces/Spaces.module.scss.d.ts
+++ b/web/src/components/GitnessLogo/GitnessLogo.module.scss.d.ts
@@ -2,7 +2,7 @@
 // this is an auto-generated file
 declare const styles: {
   readonly main: string
-  readonly pageHeading: string
-  readonly pageContent: string
+  readonly layout: string
+  readonly text: string
 }
 export default styles
diff --git a/web/src/components/GitnessLogo/GitnessLogo.tsx b/web/src/components/GitnessLogo/GitnessLogo.tsx
new file mode 100644
index 000000000..9c32b811f
--- /dev/null
+++ b/web/src/components/GitnessLogo/GitnessLogo.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { Container, Icon, Layout, Text } from '@harness/uicore'
+import { Link } from 'react-router-dom'
+import { useStrings } from 'framework/strings'
+import { routes } from 'RouteDefinitions'
+import css from './GitnessLogo.module.scss'
+
+export const GitnessLogo: React.FC = () => {
+  const { getString } = useStrings()
+
+  return (
+    <Container className={css.main}>
+      <Link to={routes.toCODEHome()}>
+        <Layout.Horizontal spacing="small" className={css.layout}>
+          <Icon name="code" size={34} />
+          <Text className={css.text}>{getString('gitness')}</Text>
+        </Layout.Horizontal>
+      </Link>
+    </Container>
+  )
+}
diff --git a/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx b/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx
index 71abbed1f..b9ae369a9 100644
--- a/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx
+++ b/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useEffect, useMemo, useState } from 'react'
 import { Icon as BPIcon, Classes, Dialog, Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core'
 import * as yup from 'yup'
@@ -84,7 +77,6 @@ export const NewRepoModalButton: React.FC<NewRepoModalButtonProps> = ({
   ...props
 }) => {
   const ModalComponent: React.FC = () => {
-    const { standalone } = useAppContext()
     const { getString } = useStrings()
     const [branchName, setBranchName] = useState(DEFAULT_BRANCH_NAME)
     const { showError } = useToaster()
@@ -92,9 +84,11 @@ export const NewRepoModalButton: React.FC<NewRepoModalButtonProps> = ({
     const { mutate: createRepo, loading: submitLoading } = useMutate<TypesRepository>({
       verb: 'POST',
       path: `/api/v1/repos`,
-      queryParams: {
-        space_path: space
-      }
+      queryParams: standalone
+        ? undefined
+        : {
+            space_path: space
+          }
     })
     const {
       data: gitignores,
@@ -124,7 +118,7 @@ export const NewRepoModalButton: React.FC<NewRepoModalButtonProps> = ({
           license: get(formData, 'license', 'none'),
           uid: get(formData, 'name', '').trim(),
           readme: get(formData, 'addReadme', false),
-          parent_id: standalone ? Number(space) : 0 // TODO: Backend needs to fix parentID: accept string or number
+          parent_ref: space
         }
         createRepo(payload)
           .then(response => {
@@ -359,3 +353,5 @@ const BranchName: React.FC<BranchNameProps> = ({ currentBranchName, onSelect })
     </Container>
   )
 }
+
+export default NewRepoModalButton
diff --git a/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss
new file mode 100644
index 000000000..9f2b00866
--- /dev/null
+++ b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss
@@ -0,0 +1,3 @@
+.divider {
+  margin: var(--spacing-medium) 0 var(--spacing-large) 0 !important;
+}
diff --git a/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss.d.ts b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss.d.ts
new file mode 100644
index 000000000..6c0f6ebb6
--- /dev/null
+++ b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss.d.ts
@@ -0,0 +1,6 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly divider: string
+}
+export default styles
diff --git a/web/src/components/NewSpaceModalButton/NewSpaceModalButton.tsx b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.tsx
new file mode 100644
index 000000000..a2f6ede04
--- /dev/null
+++ b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.tsx
@@ -0,0 +1,173 @@
+import React from 'react'
+import { Dialog, Intent } from '@blueprintjs/core'
+import * as yup from 'yup'
+import {
+  Button,
+  ButtonProps,
+  Container,
+  Layout,
+  FlexExpander,
+  Icon,
+  Formik,
+  FormikForm,
+  Heading,
+  useToaster,
+  FormInput
+} from '@harness/uicore'
+import { FontVariation } from '@harness/design-system'
+import { useMutate } from 'restful-react'
+import { get } from 'lodash-es'
+import { useModalHook } from '@harness/use-modal'
+import { useStrings } from 'framework/strings'
+import { getErrorMessage, REGEX_VALID_REPO_NAME } from 'utils/Utils'
+import type { TypesSpace, OpenapiCreateSpaceRequest } from 'services/code'
+import { useAppContext } from 'AppContext'
+
+enum RepoVisibility {
+  PUBLIC = 'public',
+  PRIVATE = 'private'
+}
+
+interface RepoFormData {
+  name: string
+  description: string
+  license: string
+  defaultBranch: string
+  gitignore: string
+  addReadme: boolean
+  isPublic: RepoVisibility
+}
+
+const formInitialValues: RepoFormData = {
+  name: '',
+  description: '',
+  license: '',
+  defaultBranch: 'main',
+  gitignore: '',
+  addReadme: false,
+  isPublic: RepoVisibility.PRIVATE
+}
+
+export interface NewSpaceModalButtonProps extends Omit<ButtonProps, 'onClick'> {
+  space: string
+  modalTitle: string
+  submitButtonTitle?: string
+  cancelButtonTitle?: string
+  onRefetch: () => void
+}
+export interface OpenapiCreateSpaceRequestExtended extends OpenapiCreateSpaceRequest {
+  parent_id?: number
+}
+
+export const NewSpaceModalButton: React.FC<NewSpaceModalButtonProps> = ({
+  space,
+  modalTitle,
+  submitButtonTitle,
+  cancelButtonTitle,
+  onRefetch,
+  ...props
+}) => {
+  const ModalComponent: React.FC = () => {
+    const { standalone } = useAppContext()
+    const { getString } = useStrings()
+    const { showError } = useToaster()
+
+    const { mutate: createSpace, loading: submitLoading } = useMutate<TypesSpace>({
+      verb: 'POST',
+      path: `/api/v1/spaces`
+    })
+
+    const loading = submitLoading
+
+    const handleSubmit = (formData: RepoFormData) => {
+      try {
+        const payload: OpenapiCreateSpaceRequestExtended = {
+          description: get(formData, 'description', '').trim(),
+          is_public: get(formData, 'isPublic') === RepoVisibility.PUBLIC,
+          uid: get(formData, 'name', '').trim(),
+          parent_id: standalone ? Number(space) : 0 // TODO: Backend needs to fix parentID: accept string or number
+        }
+        createSpace(payload)
+          .then(() => {
+            hideModal()
+            onRefetch()
+          })
+          .catch(_error => {
+            showError(getErrorMessage(_error), 0, getString('failedToCreateSpace'))
+          })
+      } catch (exception) {
+        showError(getErrorMessage(exception), 0, getString('failedToCreateSpace'))
+      }
+    }
+
+    return (
+      <Dialog
+        isOpen
+        enforceFocus={false}
+        onClose={hideModal}
+        title={''}
+        style={{ width: 700, maxHeight: '95vh', overflow: 'auto' }}>
+        <Layout.Vertical
+          padding={{ left: 'xxlarge' }}
+          style={{ height: '100%' }}
+          data-testid="add-target-to-flag-modal">
+          <Heading level={3} font={{ variation: FontVariation.H3 }} margin={{ bottom: 'xlarge' }}>
+            {modalTitle}
+          </Heading>
+
+          <Container margin={{ right: 'xxlarge' }}>
+            <Formik
+              initialValues={formInitialValues}
+              formName="editVariations"
+              enableReinitialize={true}
+              validationSchema={yup.object().shape({
+                name: yup
+                  .string()
+                  .trim()
+                  .required()
+                  .matches(REGEX_VALID_REPO_NAME, getString('validation.spaceNamePatternIsNotValid'))
+              })}
+              validateOnChange
+              validateOnBlur
+              onSubmit={handleSubmit}>
+              <FormikForm>
+                <FormInput.Text
+                  name="name"
+                  label={getString('name')}
+                  placeholder={getString('enterName')}
+                  tooltipProps={{
+                    dataTooltipId: 'spaceNameTextField'
+                  }}
+                  inputGroup={{ autoFocus: true }}
+                />
+                <FormInput.Text
+                  name="description"
+                  label={getString('description')}
+                  placeholder={getString('enterDescription')}
+                  tooltipProps={{
+                    dataTooltipId: 'spaceDescriptionTextField'
+                  }}
+                />
+
+                <Layout.Horizontal
+                  spacing="small"
+                  padding={{ right: 'xxlarge', top: 'xxxlarge', bottom: 'large' }}
+                  style={{ alignItems: 'center' }}>
+                  <Button type="submit" text={getString('createSpace')} intent={Intent.PRIMARY} disabled={loading} />
+                  <Button text={cancelButtonTitle || getString('cancel')} minimal onClick={hideModal} />
+                  <FlexExpander />
+
+                  {loading && <Icon intent={Intent.PRIMARY} name="spinner" size={16} />}
+                </Layout.Horizontal>
+              </FormikForm>
+            </Formik>
+          </Container>
+        </Layout.Vertical>
+      </Dialog>
+    )
+  }
+
+  const [openModal, hideModal] = useModalHook(ModalComponent)
+
+  return <Button onClick={openModal} {...props} />
+}
diff --git a/web/src/components/RepositoryPageHeader/RepositoryPageHeader.tsx b/web/src/components/RepositoryPageHeader/RepositoryPageHeader.tsx
index dc8bbe2bc..0e46af66b 100644
--- a/web/src/components/RepositoryPageHeader/RepositoryPageHeader.tsx
+++ b/web/src/components/RepositoryPageHeader/RepositoryPageHeader.tsx
@@ -1,9 +1,10 @@
 import React, { Fragment } from 'react'
 import { Container, Layout, Text, Color, Icon, FontVariation, PageHeader } from '@harness/uicore'
-import { Link } from 'react-router-dom'
+import { Link, useParams } from 'react-router-dom'
 import { useStrings } from 'framework/strings'
 import { useAppContext } from 'AppContext'
 import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
+import type { CODEProps } from 'RouteDefinitions'
 import type { GitInfoProps } from 'utils/GitUtils'
 import css from './RepositoryPageHeader.module.scss'
 
@@ -24,6 +25,7 @@ export function RepositoryPageHeader({
   dataTooltipId,
   extraBreadcrumbLinks = []
 }: RepositoryPageHeaderProps) {
+  const { gitRef } = useParams<CODEProps>()
   const { getString } = useStrings()
   const space = useGetSpaceParam()
   const { routes } = useAppContext()
@@ -40,7 +42,9 @@ export function RepositoryPageHeader({
           <Layout.Horizontal spacing="small" className={css.breadcrumb}>
             <Link to={routes.toCODERepositories({ space })}>{getString('repositories')}</Link>
             <Icon name="main-chevron-right" size={8} color={Color.GREY_500} />
-            <Link to={routes.toCODERepository({ repoPath: repoMetadata.path as string })}>{repoMetadata.uid}</Link>
+            <Link to={routes.toCODERepository({ repoPath: repoMetadata.path as string, gitRef })}>
+              {repoMetadata.uid}
+            </Link>
             {extraBreadcrumbLinks.map(link => (
               <Fragment key={link.url}>
                 <Icon name="main-chevron-right" size={8} color={Color.GREY_500} />
diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.tsx b/web/src/components/ReviewerSelect/ReviewerSelect.tsx
index 701205b4e..3160c6f8a 100644
--- a/web/src/components/ReviewerSelect/ReviewerSelect.tsx
+++ b/web/src/components/ReviewerSelect/ReviewerSelect.tsx
@@ -1,10 +1,3 @@
-/*
- * Copyright 2021 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
-
 import React, { useEffect, useRef, useState } from 'react'
 import { Icon as BPIcon, Menu, MenuItem, PopoverPosition } from '@blueprintjs/core'
 import {
diff --git a/web/src/components/SpaceSelector/SpaceSelector.module.scss b/web/src/components/SpaceSelector/SpaceSelector.module.scss
new file mode 100644
index 000000000..0eb5a031a
--- /dev/null
+++ b/web/src/components/SpaceSelector/SpaceSelector.module.scss
@@ -0,0 +1,171 @@
+.spaceSelector {
+  border-radius: 4px;
+  padding: 6px 10px !important;
+  border: 1px solid var(--grey-200);
+  background: var(--white) !important;
+  margin-bottom: var(--spacing-medium) !important;
+
+  &.selected,
+  &:hover {
+    background: var(--primary-1) !important;
+    border-radius: 4px;
+    border: 1px solid var(--primary-3);
+    box-shadow: 0px 2px 4px 0px rgba(96, 97, 112, 0.16), 0px 0px 1px 0px rgba(40, 41, 61, 0.04);
+
+    .icon {
+      svg path {
+        fill: var(--primary-7);
+      }
+    }
+  }
+
+  .label {
+    flex-grow: 1;
+  }
+
+  .spaceLabel {
+    color: var(--gray-500);
+    font-size: 8px !important;
+    font-weight: 600 !important;
+    line-height: 17px !important;
+  }
+
+  .spaceName {
+    color: var(--black);
+    font-size: 13px !important;
+    line-height: 20px !important;
+    padding-left: 17px !important;
+  }
+
+  .icon {
+    display: flex;
+    align-items: center;
+    padding-top: 3px;
+  }
+}
+
+.popoverPortal {
+  width: min(calc(100vw - var(--nav-menu-width)), 840px) !important;
+  height: 100vh;
+  position: fixed;
+  left: 5px;
+  top: -5px;
+
+  > div {
+    height: 100%;
+    width: 100%;
+  }
+}
+
+.popoverTarget {
+  display: block !important;
+}
+
+.popoverContent {
+  position: relative;
+  height: 100%;
+  width: min(calc(100vw - var(--nav-menu-width)), 840px) !important;
+  border-radius: 0;
+  box-shadow: none;
+  filter: drop-shadow(0px 2px 4px rgba(96, 97, 112, 0.16)) drop-shadow(0px 0px 1px rgba(40, 41, 61, 0.04));
+
+  &::before {
+    position: fixed;
+    content: '';
+    top: 0;
+    left: var(--nav-menu-width);
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(26, 26, 26, 0.4);
+  }
+
+  > div {
+    height: 100%;
+    width: 100%;
+    max-width: inherit !important;
+    border-radius: 0 !important;
+
+    &::before {
+      box-shadow: none !important;
+      filter: drop-shadow(0px 2px 4px rgba(96, 97, 112, 0.16)) drop-shadow(0px 0px 1px rgba(40, 41, 61, 0.04));
+    }
+  }
+}
+
+.nameContainer {
+  position: relative;
+
+  .name {
+    flex-grow: 1;
+    align-items: baseline !important;
+    width: calc(100% - 100px) !important;
+
+    > span {
+      width: 100%;
+      > span {
+        width: 100%;
+      }
+    }
+
+    & + span:last-of-type {
+      align-self: center;
+    }
+  }
+
+  .pinned {
+    transform: rotate(-90deg);
+    position: absolute;
+    top: 7px;
+    left: -43px;
+    font-size: var(--font-size-xsmall) !important;
+    padding: 6px 14px;
+  }
+
+  .repoName {
+    font-weight: 600 !important;
+    font-size: 16px !important;
+    line-height: 24px !important;
+    color: var(--grey-800);
+
+    .repoScope {
+      color: var(--grey-400);
+      padding: 2px 6px;
+      font-size: var(--font-size-xsmall) !important;
+      border-radius: 4px;
+      border: 1px solid var(--grey-200);
+      display: inline-block;
+      margin-left: var(--spacing-medium);
+      text-transform: uppercase;
+      line-height: 16px;
+    }
+  }
+
+  .desc {
+    color: var(--grey-500);
+    font-size: var(--font-size-small);
+    padding-top: var(--spacing-xsmall) !important;
+  }
+}
+
+.table {
+  [class*='TableV2--header'] [class*='variation-table-headers'] {
+    text-transform: none;
+    color: var(--grey-400);
+    font-weight: 500;
+    font-size: 13px;
+  }
+
+  .row {
+    height: 80px;
+    box-shadow: 0px 0px 1px rgba(40, 41, 61, 0.08), 0px 0.5px 2px rgba(96, 97, 112, 0.16);
+    overflow: hidden;
+
+    &.noDesc > div {
+      height: 44px;
+    }
+  }
+}
+
+.iconContainer {
+  padding-top: var(--spacing-4) !important;
+}
diff --git a/web/src/components/SpaceSelector/SpaceSelector.module.scss.d.ts b/web/src/components/SpaceSelector/SpaceSelector.module.scss.d.ts
new file mode 100644
index 000000000..a3bc3c6a2
--- /dev/null
+++ b/web/src/components/SpaceSelector/SpaceSelector.module.scss.d.ts
@@ -0,0 +1,24 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly spaceSelector: string
+  readonly selected: string
+  readonly icon: string
+  readonly label: string
+  readonly spaceLabel: string
+  readonly spaceName: string
+  readonly popoverPortal: string
+  readonly popoverTarget: string
+  readonly popoverContent: string
+  readonly nameContainer: string
+  readonly name: string
+  readonly pinned: string
+  readonly repoName: string
+  readonly repoScope: string
+  readonly desc: string
+  readonly table: string
+  readonly row: string
+  readonly noDesc: string
+  readonly iconContainer: string
+}
+export default styles
diff --git a/web/src/components/SpaceSelector/SpaceSelector.tsx b/web/src/components/SpaceSelector/SpaceSelector.tsx
new file mode 100644
index 000000000..325fb1fb7
--- /dev/null
+++ b/web/src/components/SpaceSelector/SpaceSelector.tsx
@@ -0,0 +1,218 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import {
+  Button,
+  ButtonVariation,
+  Color,
+  Container,
+  FontVariation,
+  Heading,
+  Icon,
+  Layout,
+  NoDataCard,
+  TableV2 as Table,
+  Text
+} from '@harness/uicore'
+import cx from 'classnames'
+import Keywords from 'react-keywords'
+import { useGet } from 'restful-react'
+import type { CellProps, Column } from 'react-table'
+import { useHistory } from 'react-router-dom'
+import { Classes, Popover, Position } from '@blueprintjs/core'
+import { routes } from 'RouteDefinitions'
+import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
+import { useStrings } from 'framework/strings'
+import { ButtonRoleProps, voidFn } from 'utils/Utils'
+import { useShowRequestError } from 'hooks/useShowRequestError'
+import { TypesSpace, useGetSpace } from 'services/code'
+import { SearchInputWithSpinner } from 'components/SearchInputWithSpinner/SearchInputWithSpinner'
+import { NewSpaceModalButton } from 'components/NewSpaceModalButton/NewSpaceModalButton'
+// import { ResourceListingPagination } from 'components/ResourceListingPagination/ResourceListingPagination'
+
+// import { usePageIndex } from 'hooks/usePageIndex'
+import css from './SpaceSelector.module.scss'
+
+interface SpaceSelectorProps {
+  onSelect: (space: TypesSpace, isUserAction: boolean) => void
+}
+
+export const SpaceSelector: React.FC<SpaceSelectorProps> = ({ onSelect }) => {
+  const { getString } = useStrings()
+  const history = useHistory()
+  const [selectedSpace, setSelectedSpace] = useState<TypesSpace | undefined>()
+  const { space } = useGetRepositoryMetadata()
+  const [opened, setOpened] = React.useState(false)
+  const [searchTerm, setSearchTerm] = useState('')
+  // const [page, setPage] = usePageIndex(1)
+
+  const { data, error } = useGetSpace({ space_ref: encodeURIComponent(space), lazy: !space })
+
+  const {
+    data: spaces,
+    refetch,
+    response
+  } = useGet({
+    path: '/api/v1/user/memberships'
+  })
+
+  const selectSpace = useCallback(
+    (_space: TypesSpace, isUserAction: boolean) => {
+      setSelectedSpace(_space)
+      onSelect(_space, isUserAction)
+    },
+    [onSelect]
+  )
+
+  useEffect(() => {
+    if (space && !selectedSpace && data) {
+      selectSpace(data, false)
+    }
+  }, [space, selectedSpace, data, onSelect, selectSpace])
+
+  useEffect(() => {
+    if (response?.status === 403) {
+      history.push(routes.toSignIn())
+    }
+  }, [response, history])
+
+  useShowRequestError(error)
+  const NewSpaceButton = (
+    <NewSpaceModalButton
+      space={space}
+      modalTitle={getString('createSpace')}
+      text={getString('newSpace')}
+      variation={ButtonVariation.PRIMARY}
+      icon="plus"
+      onRefetch={voidFn(refetch)}
+    />
+  )
+
+  const columns: Column<{ space: TypesSpace }>[] = useMemo(
+    () => [
+      {
+        Header: getString('spaces'),
+        width: 'calc(100% - 180px)',
+        Cell: ({ row }: CellProps<{ space: TypesSpace }>) => {
+          const record = row.original
+          return (
+            <Container className={css.nameContainer}>
+              <Layout.Horizontal spacing="small" style={{ flexGrow: 1 }}>
+                <Icon
+                  name={'nav-project'}
+                  size={22}
+                  className={css.iconContainer}
+                  padding={{ bottom: 'small', left: 'small', right: 'medium' }}
+                />
+                <Layout.Vertical flex className={css.name}>
+                  <Text className={css.repoName} lineClamp={2}>
+                    <Keywords value={searchTerm}>{record.space.uid}</Keywords>
+                  </Text>
+                  {record.space.description && (
+                    <Text className={css.desc} lineClamp={1}>
+                      {record.space.description}
+                    </Text>
+                  )}
+                </Layout.Vertical>
+              </Layout.Horizontal>
+            </Container>
+          )
+        }
+      }
+    ],
+    [getString, searchTerm]
+  )
+
+  return (
+    <Popover
+      portalClassName={css.popoverPortal}
+      targetClassName={css.popoverTarget}
+      popoverClassName={css.popoverContent}
+      position={Position.RIGHT}
+      usePortal={false}
+      transitionDuration={0}
+      captureDismiss
+      onInteraction={setOpened}
+      isOpen={opened}>
+      <Container
+        className={cx(css.spaceSelector, { [css.selected]: opened })}
+        {...ButtonRoleProps}
+        onClick={() => setOpened(!opened)}>
+        <Layout.Horizontal>
+          <Container className={css.label}>
+            <Layout.Vertical>
+              <Container>
+                <Text className={css.spaceLabel} icon="nav-project" iconProps={{ size: 12 }}>
+                  {getString('space').toUpperCase()}
+                </Text>
+              </Container>
+            </Layout.Vertical>
+            <Text className={css.spaceName} lineClamp={1}>
+              {selectedSpace ? selectedSpace.uid : getString('selectSpace')}
+            </Text>
+          </Container>
+          <Container className={css.icon}>
+            <Icon name="main-chevron-right" size={10} />
+          </Container>
+        </Layout.Horizontal>
+      </Container>
+
+      <Container padding="large">
+        <Heading level={2} padding={{ left: 'small' }} color={Color.BLACK}>
+          <Layout.Horizontal flex={{ justifyContent: 'space-between', alignItems: 'center' }}>
+            <Text font={{ variation: FontVariation.H5 }}>{getString('selectSpaceText')}</Text>
+            {!!spaces?.length && (
+              <Layout.Horizontal flex={{ justifyContent: 'space-between' }}>
+                <SearchInputWithSpinner
+                  loading={false}
+                  spinnerPosition="left"
+                  query={searchTerm}
+                  setQuery={setSearchTerm}
+                />
+                <Container padding={{ left: 'small', right: 'small' }}></Container>
+                {NewSpaceButton}
+                <Button icon={'small-cross'} variation={ButtonVariation.ICON} className={Classes.POPOVER_DISMISS} />
+              </Layout.Horizontal>
+            )}
+            {spaces?.length === 0 && (
+              <Container flex={{ alignItems: 'self-end' }}>
+                <Button icon={'small-cross'} variation={ButtonVariation.ICON} className={Classes.POPOVER_DISMISS} />
+              </Container>
+            )}
+          </Layout.Horizontal>
+        </Heading>
+        <Container padding={{ left: 'small' }}>
+          <Layout.Vertical padding={{ top: 'xxlarge' }} spacing="small">
+            {!!spaces?.length && (
+              <Table<{ space: TypesSpace }>
+                hideHeaders
+                className={css.table}
+                columns={columns}
+                data={spaces || []}
+                onRowClick={data => {
+                  setOpened(false)
+                  selectSpace({ uid: data?.space?.uid, path: data?.space?.path }, true)
+                }}
+                getRowClassName={row => cx(css.row, !row.original.space.description && css.noDesc)}
+              />
+            )}
+            {spaces?.length === 0 && (
+              <NoDataCard
+                button={
+                  <NewSpaceModalButton
+                    space={space}
+                    modalTitle={getString('createSpace')}
+                    text={getString('createSpace')}
+                    variation={ButtonVariation.PRIMARY}
+                    icon="plus"
+                    onRefetch={voidFn(refetch)}
+                  />
+                }
+                message={<Text font={{ variation: FontVariation.H4 }}> {getString('emptySpaceText')}</Text>}
+              />
+            )}
+            {/* <ResourceListingPagination response={response} page={page} setPage={setPage} /> */}
+          </Layout.Vertical>
+        </Container>
+      </Container>
+    </Popover>
+  )
+}
diff --git a/web/src/components/UserManagementFlows/AddUserModal.tsx b/web/src/components/UserManagementFlows/AddUserModal.tsx
index c14802e5c..4ebd3c33c 100644
--- a/web/src/components/UserManagementFlows/AddUserModal.tsx
+++ b/web/src/components/UserManagementFlows/AddUserModal.tsx
@@ -216,6 +216,7 @@ export const FormInputWithCopyButton: React.FC<
   return (
     <FormInput.Text
       {...props}
+      className={css.inputWrapper}
       inputGroup={{
         ...props.inputGroup,
         rightElement: (
diff --git a/web/src/components/UserManagementFlows/UserManagementFlows.module.scss b/web/src/components/UserManagementFlows/UserManagementFlows.module.scss
index c5b0a2d3a..d870622ed 100644
--- a/web/src/components/UserManagementFlows/UserManagementFlows.module.scss
+++ b/web/src/components/UserManagementFlows/UserManagementFlows.module.scss
@@ -1,12 +1,6 @@
 .dialogCtn {
   overflow: unset !important;
 
-  button#copyBtn {
-    border-radius: 0 !important;
-    border-left: 1px solid var(--grey-200) !important;
-    margin-left: var(--spacing-small) !important;
-  }
-
   :global {
     .bp3-form-group,
     .TextInput--main {
@@ -45,3 +39,11 @@
     }
   }
 }
+
+.inputWrapper {
+  button#copyBtn {
+    border-radius: 0 !important;
+    border-left: 1px solid var(--grey-200) !important;
+    margin-left: var(--spacing-small) !important;
+  }
+}
diff --git a/web/src/components/UserManagementFlows/UserManagementFlows.module.scss.d.ts b/web/src/components/UserManagementFlows/UserManagementFlows.module.scss.d.ts
index 79d5ec7d8..65a5f8529 100644
--- a/web/src/components/UserManagementFlows/UserManagementFlows.module.scss.d.ts
+++ b/web/src/components/UserManagementFlows/UserManagementFlows.module.scss.d.ts
@@ -2,10 +2,11 @@
 // this is an auto-generated file
 declare const styles: {
   readonly dialogCtn: string
-  readonly copyBtn: string
   readonly passwordCtn: string
   readonly layout: string
   readonly text: string
   readonly formikForm: string
+  readonly inputWrapper: string
+  readonly copyBtn: string
 }
 export default styles
diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts
index 28cdf29a1..5fa4a368f 100644
--- a/web/src/framework/strings/stringTypes.ts
+++ b/web/src/framework/strings/stringTypes.ts
@@ -3,6 +3,7 @@
  * Use the command `yarn strings` to regenerate this file.
  */
 export interface StringsMap {
+  accessControl: string
   accountEmail: string
   accountSetting: string
   active: string
@@ -11,6 +12,7 @@ export interface StringsMap {
   addComment: string
   addGitIgnore: string
   addLicense: string
+  addMember: string
   addNewFile: string
   addReadMe: string
   addUser: string
@@ -50,6 +52,7 @@ export interface StringsMap {
   cancel: string
   changePassword: string
   changePasswordSuccesfully: string
+  changeRole: string
   changes: string
   characterLimit: string
   checkRuns: string
@@ -84,6 +87,7 @@ export interface StringsMap {
   confirmation: string
   content: string
   contents: string
+  contributor: string
   conversation: string
   copy: string
   copyBranch: string
@@ -104,6 +108,7 @@ export interface StringsMap {
   'createRepoModal.privateLabel': string
   'createRepoModal.publicLabel': string
   createRepoPerms: string
+  createSpace: string
   createTag: string
   createWebhook: string
   created: string
@@ -118,6 +123,7 @@ export interface StringsMap {
   deleteNotAllowed: string
   deleteRepoText: string
   deleteRepoTitle: string
+  deleteSpace: string
   deleteTag: string
   deleteTagConfirm: string
   deleteToken: string
@@ -134,6 +140,7 @@ export interface StringsMap {
   download: string
   draft: string
   edit: string
+  editAsText: string
   editFile: string
   editNotAllowed: string
   editUser: string
@@ -142,11 +149,13 @@ export interface StringsMap {
   emailRequired: string
   emptyRepoHeader: string
   emptyRepoInclude: string
+  emptySpaceText: string
   enableSSLVerification: string
   enableWebhookContent: string
   enableWebhookTitle: string
   enabled: string
   enterDescription: string
+  enterName: string
   enterNewBranchName: string
   enterNewPassword: string
   enterRepoName: string
@@ -154,12 +163,14 @@ export interface StringsMap {
   enterTagPlaceholder: string
   enterUser: string
   error404Text: string
+  executor: string
   existingAccount: string
   expiration: string
   expirationDate: string
   expired: string
   failedToCreateBranch: string
   failedToCreateRepo: string
+  failedToCreateSpace: string
   failedToDeleteBranch: string
   failedToDeleteWebhook: string
   fileDeleted: string
@@ -176,9 +187,12 @@ export interface StringsMap {
   generateCloneText: string
   getMyCloneTitle: string
   gitIgnore: string
+  gitness: string
   help: string
   hideCommitHistory: string
   history: string
+  'homepage.firstStep': string
+  'homepage.welcomeText': string
   in: string
   inactiveBranches: string
   leaveAComment: string
@@ -206,13 +220,16 @@ export interface StringsMap {
   newFile: string
   newFileNotAllowed: string
   newFolder: string
+  newMember: string
   newPullRequest: string
   newRepo: string
+  newSpace: string
   newTag: string
   'newToken.expireOn': string
   'newToken.generateToken': string
   'newToken.namePlaceholder': string
   'newToken.text': string
+  'newToken.tokenHelptext': string
   'newUserModal.displayNamePlaceholder': string
   'newUserModal.emailPlaceholder': string
   'newUserModal.passwordHelptext': string
@@ -230,6 +247,8 @@ export interface StringsMap {
   noCommits: string
   noCommitsMessage: string
   noCommitsPR: string
+  noExpiration: string
+  noExpirationDate: string
   noOptionalReviewers: string
   noRequiredReviewers: string
   noResultMessage: string
@@ -247,8 +266,30 @@ export interface StringsMap {
   optional: string
   optionalExtendedDescription: string
   overview: string
+  owner: string
   pageLoading: string
   pageNotFound: string
+  'pageTitle.accessControl': string
+  'pageTitle.branches': string
+  'pageTitle.changePassword': string
+  'pageTitle.commits': string
+  'pageTitle.compare': string
+  'pageTitle.createWebhook': string
+  'pageTitle.editFile': string
+  'pageTitle.home': string
+  'pageTitle.pullRequest': string
+  'pageTitle.pullRequests': string
+  'pageTitle.register': string
+  'pageTitle.repositories': string
+  'pageTitle.repository': string
+  'pageTitle.repositorySettings': string
+  'pageTitle.signin': string
+  'pageTitle.spaceSettings': string
+  'pageTitle.tags': string
+  'pageTitle.userProfile': string
+  'pageTitle.users': string
+  'pageTitle.webhookDetail': string
+  'pageTitle.webhooks': string
   password: string
   passwordApi: string
   passwordRequired: string
@@ -279,7 +320,6 @@ export interface StringsMap {
   'pr.failedToUpdateTitle': string
   'pr.fileDeleted': string
   'pr.fileUnchanged': string
-  'pr.forceMergeWithUnresolvedComment': string
   'pr.mergeOptions.close': string
   'pr.mergeOptions.closeDesc': string
   'pr.mergeOptions.createMergeCommit': string
@@ -291,7 +331,6 @@ export interface StringsMap {
   'pr.mergePR': string
   'pr.metaLine': string
   'pr.modalTitle': string
-  'pr.notMergeableWithUnresolvedComment': string
   'pr.openForReview': string
   'pr.outdated': string
   'pr.prBranchPushInfo': string
@@ -334,6 +373,7 @@ export interface StringsMap {
   quote: string
   reactivate: string
   readMe: string
+  reader: string
   refresh: string
   reject: string
   rejected: string
@@ -369,6 +409,7 @@ export interface StringsMap {
   resolvedComments: string
   reviewerNotFound: string
   reviewers: string
+  role: string
   samplePayloadUrl: string
   save: string
   scanAlerts: string
@@ -377,6 +418,8 @@ export interface StringsMap {
   searchBranches: string
   secret: string
   selectBranchPlaceHolder: string
+  selectSpace: string
+  selectSpaceText: string
   selectToViewMore: string
   setAsAdmin: string
   settings: string
@@ -384,6 +427,16 @@ export interface StringsMap {
   showEverything: string
   signIn: string
   signUp: string
+  space: string
+  'spaceMemberships.addMember': string
+  'spaceMemberships.changeRole': string
+  'spaceMemberships.memberAdded': string
+  'spaceMemberships.memberUpdated': string
+  'spaceMemberships.removeMember': string
+  'spaceMemberships.removeMembershipMsg': string
+  'spaceMemberships.removeMembershipToast': string
+  'spaceSetting.intentText': string
+  'spaceSetting.setting': string
   spaces: string
   sslVerificationLabel: string
   status: string
@@ -410,6 +463,7 @@ export interface StringsMap {
   updateUser: string
   updateWebhook: string
   updated: string
+  user: string
   userCreated: string
   userId: string
   'userManagement.deleteUser': string
@@ -434,6 +488,7 @@ export interface StringsMap {
   'validation.nameIsRequired': string
   'validation.newPasswordRequired': string
   'validation.repoNamePatternIsNotValid': string
+  'validation.spaceNamePatternIsNotValid': string
   'validation.uidInvalid': string
   'validation.uidRequired': string
   viewAllBranches: string
diff --git a/web/src/global.d.ts b/web/src/global.d.ts
index de66a28cb..d174c6273 100644
--- a/web/src/global.d.ts
+++ b/web/src/global.d.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 declare const __DEV__: boolean
-declare const __ON_PREM__: booelan
 
 declare module '*.png' {
   const value: string
diff --git a/web/src/hooks/useConfirmAction.tsx b/web/src/hooks/useConfirmAction.tsx
index 24d40724b..f33d7ff55 100644
--- a/web/src/hooks/useConfirmAction.tsx
+++ b/web/src/hooks/useConfirmAction.tsx
@@ -1,9 +1,3 @@
-/*
- * Copyright 2022 Harness Inc. All rights reserved.
- * Use of this source code is governed by the PolyForm Shield 1.0.0 license
- * that can be found in the licenses directory at the root of this repository, also available at
- * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
- */
 import React from 'react'
 import { Intent } from '@blueprintjs/core'
 import { useCallback, useRef, useState } from 'react'
diff --git a/web/src/hooks/useDocumentTitle.tsx b/web/src/hooks/useDocumentTitle.tsx
new file mode 100644
index 000000000..232cbcf21
--- /dev/null
+++ b/web/src/hooks/useDocumentTitle.tsx
@@ -0,0 +1,16 @@
+import { useEffect } from 'react'
+import { useStrings } from 'framework/strings'
+
+export function useDocumentTitle(title: string) {
+  const { getString } = useStrings()
+
+  useEffect(() => {
+    const _title = document.title
+
+    document.title = `${title} - ${getString('gitness')}`
+
+    return () => {
+      document.title = _title
+    }
+  }, [title, getString])
+}
diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml
index 683acce97..cbb27c5ed 100644
--- a/web/src/i18n/strings.en.yaml
+++ b/web/src/i18n/strings.en.yaml
@@ -1,3 +1,4 @@
+gitness: Gitness
 pageNotFound: Page Not Found
 signIn: Sign In
 signUp: Sign Up
@@ -43,6 +44,7 @@ on: On
 off: Off
 loading: Loading...
 title: Title
+accessControl: Access Control
 addGitIgnore: Add a .gitignore
 addReadMe: Add a README file
 failedToCreateRepo: Failed to create Repository. Please try again.
@@ -66,6 +68,28 @@ cloneHTTPS: Clone with HTTPS
 nameYourFile: Name your file...
 noResultTitle: Sorry, no result found
 noResultMessage: What you searched was unfortunately not found or doesn’t exist
+pageTitle:
+  signin: Sign In
+  register: Register a new account
+  accessControl: Access Control
+  spaceSettings: Space Settings
+  compare: Pull Request Compare
+  pullRequest: Pull Request
+  pullRequests: Pull Requests
+  createWebhook: Create Webhook
+  webhookDetail: Webhook Detail
+  webhooks: Webhooks
+  repositorySettings: Repository Settings
+  repositories: Repositories
+  commits: Commits
+  branches: Branches
+  tags: Tags
+  editFile: Edit File
+  repository: Repository
+  home: Home
+  users: Users
+  userProfile: User Profile
+  changePassword: Change Password
 repos:
   name: Repo Name
   data: Repo Data
@@ -92,6 +116,7 @@ validation:
   expirationDateRequired: Expiration date is required
   newPasswordRequired: New password is a required field
   confirmPasswordRequired: Confirm Password is a required field
+  spaceNamePatternIsNotValid: "Name can only contain alphanumerics, '-', '_', '.', and '$'"
 commitMessage: Commit message
 optionalExtendedDescription: Optional extended description
 optional: Optional
@@ -105,6 +130,7 @@ createABranch: Create a branch
 createATag: Create a tag
 delete: Delete
 edit: Edit
+editAsText: Edit as Text
 branchName: Branch name
 nameYourBranch: Name your branch
 nameYourTag: Name your tag
@@ -244,8 +270,6 @@ pr:
     rebaseAndMergeDesc: All commits from this branch will be rebased and added to the base branch.
     close: Close pull request
     closeDesc: Close this pull request. You can still re-open the request after closing.
-  forceMergeWithUnresolvedComment: This pull request has {unrsolvedComment} unresolved {unrsolvedComment|1:comment,comments}. As an administrator, you can still merge it.\nAre you sure you want to force merge it?
-  notMergeableWithUnresolvedComment: This pull request has {unrsolvedComment} unresolved {unrsolvedComment|1:comment,comments}. Please resolve them before merging.
   outdated: Outdated
   titleIsRequired: Pull Request title is required.
   descIsRequired: Pull Request description is required.
@@ -445,6 +469,8 @@ users: Users
 findAUser: Find a user
 reviewerNotFound: 'Reviewer <strong>{{reviewer}}</strong> not found.'
 spaces: Spaces
+space: Space
+selectSpace: Select space here
 copyBranch: Copy Branch Name
 noAccount?: No Account?
 alreadyHaveAccount: Already have an account?
@@ -479,6 +505,8 @@ confirmNewPassword: Confirm the <b>NEW</b> password
 accountSetting: Account Setting
 nDays: '{{number}} Days'
 expiration: Expiration
+noExpiration: No Expiration
+noExpirationDate: The token will never expire!
 token: Token
 expired: Expired
 expirationDate: Expiration Date
@@ -491,6 +519,9 @@ newToken:
   namePlaceholder: Enter the name
   expireOn: Token will expire on {{date}}
   generateToken: Generate Token
+  tokenHelptext:
+    Your token has been generated. Please make sure to copy and store your token somewhere safe, you wont be
+    able to see it again.
 deleteToken: Delete token
 deleteTokenMsg: Token deleted successfully
 userProfile:
@@ -516,3 +547,33 @@ newUserModal:
   userCreated: User created successfully
   userUpdated: User updated successfully
   userDeleted: User '{{name}}' deleted successfully
+selectSpaceText: 'Select a Space'
+user: User
+role: Role
+newMember: New Member
+addMember: Add member
+spaceMemberships:
+  addMember: Add a new member
+  changeRole: Change Role
+  removeMember: Remove Member
+  removeMembershipMsg: Are you sure you want to remove this member?
+  removeMembershipToast: Member removed successfully
+  memberUpdated: Member updated successfully.
+  memberAdded: Member added successfully.
+failedToCreateSpace: Failed to create Space. Please try again.
+enterName: Enter the name
+createSpace: Create Space
+newSpace: New Space
+emptySpaceText: "It's empty now, please create a new space"
+homepage:
+  welcomeText: Welcome {{currentUser}}, let's get you started with Gitness!
+  firstStep: Get started by creating a space.  Organize and manage your repositories and pipelines with spaces
+deleteSpace: Delete Space
+spaceSetting:
+  intentText: This will permanently delete the space named '{{space}}', and everything contained in it.  All repositories in this space will be deleted.
+  setting: Setting
+contributor: Contributor
+reader: Reader
+executor: Executor
+owner: Owner
+changeRole: Change role
diff --git a/web/src/images/index.ts b/web/src/images/index.ts
index aea9fa9df..f292d61e7 100644
--- a/web/src/images/index.ts
+++ b/web/src/images/index.ts
@@ -9,6 +9,7 @@ import PrUnchecked from 'images/pull-request-unchecked.svg'
 import DarkBackground from 'images/dark-background.png'
 import Signup from 'images/signup.png'
 import Subtract from 'images/Subtract.png'
+import EmptySpace from 'images/no-space.svg'
 
 export const Images = {
   PrOpen,
@@ -21,5 +22,6 @@ export const Images = {
   PrUnchecked,
   DarkBackground,
   Signup,
-  Subtract
+  Subtract,
+  EmptySpace
 }
diff --git a/web/src/images/no-space.svg b/web/src/images/no-space.svg
new file mode 100644
index 000000000..62f0593c5
--- /dev/null
+++ b/web/src/images/no-space.svg
@@ -0,0 +1,167 @@
+<svg width="544" height="286" viewBox="0 0 544 286" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.7" d="M447.999 122.5C447.999 165.026 374.036 199.499 282.799 199.499C191.562 199.499 117.6 165.026 117.6 122.5C117.6 79.9739 191.562 45.4999 282.799 45.4999C374.036 45.4999 447.999 79.9739 447.999 122.5Z" fill="url(#paint0_radial_4153_404911)" fill-opacity="0.1"/>
+<path opacity="0.7" d="M330.399 206.499C330.399 249.025 256.437 283.499 165.2 283.499C73.9624 283.499 0 249.025 0 206.499C0 163.974 73.9624 129.5 165.2 129.5C256.437 129.5 330.399 163.974 330.399 206.499Z" fill="url(#paint1_radial_4153_404911)" fill-opacity="0.1"/>
+<path opacity="0.7" d="M543.199 198.1C543.199 240.625 469.236 275.099 377.999 275.099C286.762 275.099 212.8 240.625 212.8 198.1C212.8 155.574 286.762 121.1 377.999 121.1C469.236 121.1 543.199 155.574 543.199 198.1Z" fill="url(#paint2_radial_4153_404911)" fill-opacity="0.1"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M422.747 72.2363C422.893 72.5944 422.721 73.0028 422.363 73.1486C386.424 87.7789 283.816 137.524 251.613 153.675C250.639 154.164 249.686 154.641 248.753 155.109C241.965 158.509 236.26 161.367 231.763 163.838C226.621 166.664 223.163 168.931 221.462 170.864C220.618 171.823 220.29 172.607 220.301 173.263C220.311 173.897 220.644 174.588 221.537 175.36C222.435 176.136 223.831 176.934 225.799 177.765C227.759 178.593 230.246 179.439 233.295 180.328C237.695 181.611 244.744 183.605 253.358 186.041C277.595 192.897 314.214 203.254 339.011 211.133C345.329 213.14 350.703 215.203 354.97 217.341C359.224 219.473 362.435 221.706 364.365 224.079C366.321 226.483 366.987 229.072 366.037 231.783C365.111 234.426 362.688 237.06 358.795 239.727C348.554 246.742 306.951 272.195 282.441 285.911C282.104 286.099 281.677 285.979 281.488 285.642C281.299 285.304 281.42 284.878 281.757 284.689C306.247 270.985 347.811 245.554 358.003 238.572C361.81 235.964 363.937 233.543 364.716 231.32C365.471 229.164 364.999 227.076 363.279 224.962C361.534 222.817 358.532 220.691 354.343 218.593C350.166 216.5 344.867 214.462 338.587 212.467C313.814 204.596 277.248 194.254 253.01 187.398C244.384 184.958 237.319 182.96 232.903 181.672C229.827 180.775 227.283 179.912 225.254 179.055C223.232 178.2 221.681 177.335 220.621 176.418C219.556 175.497 218.921 174.462 218.901 173.286C218.882 172.13 219.462 171.017 220.411 169.939C222.298 167.796 225.971 165.424 231.089 162.612C235.611 160.126 241.343 157.255 248.126 153.857C249.059 153.389 250.013 152.912 250.985 152.424C283.182 136.276 385.838 86.5062 421.835 71.8519C422.193 71.7061 422.601 71.8782 422.747 72.2363Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M412.223 60.983C412.398 61.3276 412.261 61.749 411.916 61.9242C391.249 72.4328 347.996 92.2402 306.604 111.068C299.914 114.112 293.272 117.129 286.782 120.078C253.102 135.38 223.506 148.827 212.367 154.376C210.383 155.365 208.424 156.332 206.507 157.279C201.99 159.51 197.704 161.626 193.857 163.637C188.372 166.504 183.835 169.127 180.833 171.521C179.33 172.719 178.254 173.827 177.63 174.842C177.012 175.847 176.87 176.699 177.108 177.46C177.353 178.245 178.05 179.092 179.457 179.962C180.857 180.829 182.886 181.671 185.651 182.478C188.523 183.315 192.748 184.537 197.946 186.041C223.139 193.327 271.205 207.23 299.067 216.082C305.367 218.084 310.947 219.95 315.484 221.779C320.004 223.602 323.561 225.417 325.761 227.342C326.866 228.309 327.674 229.342 328.064 230.462C328.463 231.605 328.406 232.782 327.882 233.97C326.866 236.272 324.095 238.603 319.537 241.113C308.76 247.046 295.273 254.826 281.325 262.872C268.92 270.028 256.15 277.395 244.597 283.86C244.259 284.049 243.833 283.928 243.644 283.591C243.455 283.254 243.576 282.827 243.913 282.638C255.418 276.201 268.186 268.835 280.599 261.675C294.573 253.614 308.097 245.813 318.862 239.887C323.403 237.387 325.789 235.245 326.601 233.405C326.991 232.522 327.017 231.711 326.742 230.923C326.46 230.113 325.84 229.272 324.839 228.396C322.828 226.637 319.461 224.893 314.96 223.078C310.477 221.269 304.94 219.417 298.643 217.417C270.802 208.571 222.765 194.677 197.567 187.388C192.365 185.884 188.136 184.661 185.259 183.822C182.436 182.998 180.272 182.113 178.72 181.153C177.174 180.197 176.158 179.118 175.771 177.877C175.376 176.611 175.683 175.335 176.437 174.109C177.185 172.894 178.403 171.667 179.96 170.426C183.077 167.941 187.72 165.265 193.209 162.396C197.07 160.378 201.379 158.25 205.903 156.016C207.817 155.07 209.769 154.106 211.743 153.123C222.907 147.562 252.535 134.1 286.212 118.799C292.7 115.851 299.339 112.835 306.025 109.794C347.43 90.9598 390.649 71.1676 411.282 60.6763C411.626 60.5011 412.048 60.6384 412.223 60.983Z" fill="black"/>
+<path d="M201.287 208.083L165.659 223.075L134.227 213.176L134.227 173.28L175.047 158.149L201.287 168.057L201.287 169.522L201.287 177.525L201.287 208.083Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M169.469 157.598C169.571 157.225 169.956 157.006 170.329 157.108C175.737 158.587 181.252 160.426 186.957 162.347C187.307 162.465 187.657 162.583 188.008 162.701C193.392 164.515 198.952 166.388 204.786 168.104C205.157 168.213 205.369 168.602 205.26 168.973C205.151 169.344 204.762 169.556 204.391 169.447C198.53 167.724 192.946 165.842 187.566 164.03C187.214 163.911 186.862 163.792 186.51 163.674C180.801 161.751 175.323 159.926 169.959 158.458C169.586 158.356 169.367 157.971 169.469 157.598Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.227 170.533C134.613 170.533 134.927 170.847 134.927 171.233L134.927 214.028C134.927 214.414 134.613 214.728 134.227 214.728C133.84 214.728 133.527 214.414 133.527 214.028L133.527 171.233C133.527 170.847 133.84 170.533 134.227 170.533Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M201.286 166.624C201.673 166.624 201.986 166.937 201.986 167.324L201.986 208.548C201.986 208.934 201.673 209.248 201.286 209.248C200.899 209.248 200.586 208.934 200.586 208.548L200.586 167.324C200.586 166.937 200.899 166.624 201.286 166.624ZM167.332 178.526C167.718 178.526 168.032 178.839 168.032 179.226L168.032 223.827C168.032 224.214 167.718 224.527 167.332 224.527C166.945 224.527 166.632 224.214 166.632 223.827L166.632 179.226C166.632 178.839 166.945 178.526 167.332 178.526Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.703 213.839C132.805 213.466 133.19 213.246 133.563 213.348C139.507 214.975 145.856 216.612 152.496 218.324C157.896 219.717 163.488 221.159 169.21 222.685C169.584 222.784 169.806 223.168 169.706 223.541C169.607 223.915 169.223 224.137 168.85 224.037C163.157 222.519 157.569 221.078 152.167 219.685C145.511 217.969 139.136 216.325 133.193 214.699C132.82 214.597 132.601 214.212 132.703 213.839Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.4 173.082C134.502 172.709 134.887 172.489 135.26 172.591C141.205 174.218 147.554 175.855 154.193 177.567C159.593 178.959 165.185 180.401 170.908 181.927C171.281 182.027 171.503 182.411 171.404 182.784C171.304 183.158 170.921 183.38 170.547 183.28C164.854 181.762 159.267 180.321 153.864 178.928C147.208 177.212 140.833 175.568 134.891 173.942C134.518 173.84 134.298 173.455 134.4 173.082Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M206.187 206.989C206.322 207.352 206.137 207.755 205.774 207.889C198.098 210.734 171.117 221.659 163.555 224.823C163.198 224.973 162.788 224.805 162.639 224.448C162.49 224.091 162.658 223.681 163.015 223.532C170.581 220.366 197.583 209.432 205.288 206.576C205.65 206.442 206.053 206.627 206.187 206.989Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M203.34 167.081C203.475 167.443 203.29 167.846 202.927 167.981C197.725 169.909 186.258 174.869 177.042 178.856C172.663 180.75 168.792 182.424 166.343 183.449C165.987 183.598 165.576 183.43 165.427 183.074C165.278 182.717 165.446 182.307 165.803 182.158C168.215 181.148 172.053 179.488 176.409 177.604C185.644 173.61 197.204 168.609 202.441 166.668C202.803 166.533 203.206 166.718 203.34 167.081Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.026 157.553C174.161 157.915 173.976 158.318 173.613 158.452C167.063 160.88 148.542 168.658 138.546 172.855C136.833 173.575 135.37 174.189 134.261 174.653C133.904 174.802 133.494 174.634 133.345 174.278C133.196 173.921 133.364 173.511 133.72 173.362C134.824 172.9 136.281 172.288 137.99 171.571C147.976 167.377 166.544 159.58 173.127 157.14C173.489 157.005 173.892 157.19 174.026 157.553Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.372 162.662C187.519 163.02 187.347 163.429 186.99 163.575C181.898 165.658 174.152 169.06 167.007 172.199C161.541 174.6 156.427 176.846 153.12 178.23C152.763 178.379 152.353 178.211 152.204 177.855C152.055 177.498 152.223 177.088 152.58 176.939C155.818 175.583 160.914 173.345 166.378 170.946C173.564 167.79 181.387 164.354 186.46 162.279C186.817 162.133 187.226 162.304 187.372 162.662Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M181.613 175.657C181.966 175.81 182.173 176.232 182.077 176.604C180.231 183.73 177.939 191.729 175.671 199.639L175.596 199.901C175.57 199.991 175.544 200.081 175.518 200.171L169.393 222.181C169.29 222.55 168.923 222.724 168.57 222.572C168.217 222.419 168.01 221.996 168.106 221.624C169.831 214.966 172.021 207.324 174.237 199.597L180.79 176.048C180.893 175.679 181.26 175.504 181.613 175.657ZM173.552 179.107C173.905 179.26 174.111 179.683 174.015 180.054C172.975 184.071 172.054 187.195 171.144 190.282L171.126 190.344C171.12 190.364 171.114 190.385 171.107 190.406L168.324 200.314C168.221 200.683 167.853 200.856 167.501 200.703C167.148 200.55 166.942 200.128 167.038 199.756C168.035 195.904 168.93 192.867 169.827 189.826L172.729 179.496C172.832 179.128 173.2 178.954 173.552 179.107Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M201.91 167.131C202.266 167.281 202.477 167.706 202.38 168.081L190.69 213.217C190.593 213.591 190.226 213.772 189.87 213.622C189.514 213.472 189.303 213.047 189.4 212.672L201.09 167.537C201.187 167.162 201.554 166.981 201.91 167.131ZM194.12 171.216C194.476 171.366 194.687 171.791 194.59 172.166L183.252 215.941C183.156 216.316 182.788 216.497 182.432 216.347C182.076 216.197 181.866 215.772 181.963 215.397L193.3 171.622C193.397 171.247 193.764 171.066 194.12 171.216ZM187.47 173.974C187.826 174.124 188.037 174.549 187.94 174.924L176.522 219.183C176.426 219.557 176.059 219.739 175.702 219.589C175.346 219.44 175.136 219.014 175.232 218.64L186.65 174.381C186.747 174.006 187.114 173.824 187.47 173.974ZM201.922 190.836C202.277 190.993 202.48 191.422 202.376 191.793L197.231 210.212C197.127 210.583 196.756 210.756 196.401 210.599C196.047 210.442 195.844 210.013 195.948 209.642L201.093 191.223C201.197 190.852 201.568 190.678 201.922 190.836Z" fill="black"/>
+<path d="M157.324 93.3271C155.842 99.0431 150.893 106.344 146.11 106.663C135.811 107.349 135.502 100.013 135.502 93.9332C136.137 88.2172 141.316 81.2036 146.11 81.2036C152.778 81.2036 158.595 84.2237 157.324 93.3271Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.977 87.5553C150.98 87.6761 151.939 88.3846 152.757 89.6278C152.969 89.9508 152.88 90.3849 152.557 90.5973C152.234 90.8098 151.8 90.7202 151.587 90.3972C150.892 89.34 150.247 88.9979 149.81 88.9452C149.396 88.8954 148.989 89.0841 148.674 89.526C148.034 90.4252 147.925 92.2585 149.512 93.779C151.48 95.6636 152.019 98.4008 150.888 100.072C150.295 100.95 149.294 101.426 148.047 101.303C146.839 101.183 145.424 100.51 143.844 99.193C143.547 98.9455 143.507 98.5041 143.754 98.2071C144.002 97.9101 144.443 97.87 144.74 98.1175C146.21 99.3423 147.366 99.8284 148.185 99.9093C148.965 99.9864 149.447 99.7038 149.729 99.2877C150.348 98.3714 150.205 96.3812 148.544 94.7901C146.503 92.8348 146.452 90.2316 147.534 88.7136C148.081 87.9468 148.951 87.4317 149.977 87.5553Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.343 86.288C151.715 86.3915 151.933 86.7774 151.83 87.1499C150.552 91.749 148.766 97.106 146.964 102.01C146.83 102.373 146.428 102.559 146.065 102.426C145.702 102.292 145.516 101.89 145.65 101.527C147.444 96.6467 149.217 91.3273 150.481 86.7752C150.584 86.4027 150.97 86.1846 151.343 86.288Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M141.009 82.8591C141.112 82.4863 141.497 82.268 141.869 82.3715L146.55 83.6717C146.922 83.7751 147.141 84.1612 147.039 84.534C146.936 84.9067 146.551 85.125 146.179 85.0216L141.498 83.7214C141.126 83.6179 140.907 83.2319 141.009 82.8591ZM143.345 81.5773C143.437 81.2018 143.816 80.9731 144.191 81.0664C145.223 81.3231 145.786 81.4843 146.332 81.6413L146.352 81.647C146.884 81.7999 147.404 81.9493 148.354 82.1854C148.729 82.2787 148.958 82.6587 148.866 83.0341C148.774 83.4096 148.395 83.6383 148.02 83.545C147.046 83.3028 146.507 83.1481 145.968 82.9932L145.95 82.9878C145.411 82.8332 144.866 82.677 143.857 82.426C143.482 82.3327 143.253 81.9527 143.345 81.5773Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M136.648 88.2853C136.753 87.9133 137.139 87.6979 137.511 87.8041L141.754 89.0164C142.126 89.1226 142.342 89.5103 142.237 89.8823C142.132 90.2543 141.745 90.4697 141.374 90.3635L137.131 89.1512C136.759 89.045 136.543 88.6573 136.648 88.2853ZM137.874 86.1205C138.003 85.7561 138.403 85.5662 138.767 85.6963L143.01 87.2118C143.374 87.3418 143.565 87.7426 143.436 88.107C143.307 88.4713 142.907 88.6612 142.543 88.5311L138.3 87.0157C137.936 86.8856 137.745 86.4848 137.874 86.1205ZM139.384 84.3161C139.506 83.949 139.901 83.7506 140.268 83.8729L144.814 85.3884C145.181 85.5107 145.38 85.9073 145.259 86.2744C145.138 86.6414 144.742 86.8398 144.375 86.7175L139.829 85.202C139.462 85.0797 139.263 84.6831 139.384 84.3161Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.829 92.8315C134.934 92.4596 135.321 92.2441 135.693 92.3503L139.936 93.5627C140.308 93.6689 140.524 94.0565 140.419 94.4285C140.314 94.8005 139.927 95.016 139.555 94.9098L135.312 93.6974C134.94 93.5912 134.724 93.2035 134.829 92.8315ZM135.739 90.407C135.844 90.035 136.23 89.8195 136.602 89.9257L140.845 91.1379C141.217 91.2441 141.433 91.6318 141.328 92.0038C141.223 92.3758 140.836 92.5912 140.464 92.485L136.221 91.2728C135.85 91.1666 135.633 90.779 135.739 90.407ZM134.526 96.1656C134.631 95.7936 135.018 95.5781 135.39 95.6843L139.633 96.8967C140.005 97.0029 140.221 97.3906 140.116 97.7626C140.01 98.1346 139.624 98.35 139.252 98.2438L135.009 97.0314C134.637 96.9252 134.421 96.5375 134.526 96.1656Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.821 99.2311C134.906 98.8541 135.281 98.619 135.658 98.7059L139.598 99.6152C139.975 99.7021 140.211 100.078 140.125 100.455C140.039 100.832 139.664 101.067 139.287 100.98L135.347 100.071C134.97 99.9841 134.735 99.6081 134.821 99.2311ZM136.036 101.947C136.128 101.571 136.508 101.343 136.883 101.437L140.52 102.346C140.895 102.44 141.124 102.82 141.031 103.195C140.938 103.571 140.559 103.799 140.184 103.705L136.547 102.796C136.172 102.702 135.943 102.322 136.036 101.947Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M144.385 87.1656C142.304 89.6441 140.78 92.8184 140.44 95.5356C139.84 100.337 140.482 103.681 142.363 105.562C142.391 105.591 142.418 105.622 142.441 105.655C142.639 105.938 142.975 106.158 143.463 106.296C143.951 106.433 144.543 106.473 145.165 106.428C145.784 106.383 146.404 106.256 146.934 106.083C147.477 105.906 147.874 105.697 148.087 105.52C148.137 105.478 148.194 105.443 148.254 105.416C150.2 104.56 151.98 102.762 153.396 100.464C154.807 98.1751 155.818 95.4509 156.258 92.8359C156.7 90.2076 156.553 87.77 155.744 86.007C154.96 84.2993 153.543 83.1845 151.242 83.1158C149 83.0489 146.487 84.6625 144.385 87.1656ZM143.313 86.2653C145.506 83.6535 148.392 81.6301 151.284 81.7164C154.139 81.8016 156.019 83.2522 157.016 85.4227C157.988 87.538 158.106 90.2915 157.638 93.0683C157.169 95.8583 156.095 98.7534 154.588 101.199C153.105 103.605 151.164 105.636 148.903 106.659C148.502 106.969 147.952 107.223 147.369 107.414C146.732 107.622 146.001 107.771 145.266 107.824C144.535 107.877 143.771 107.837 143.083 107.643C142.413 107.454 141.77 107.105 141.332 106.51C139.003 104.143 138.442 100.231 139.051 95.3619C139.431 92.3203 141.099 88.9017 143.313 86.2653Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M139.937 85.6248C137.923 87.9111 136.482 90.8507 136.198 93.4044C136.194 93.4405 136.187 93.4762 136.178 93.5113C135.757 95.0519 135.751 96.9849 136.113 98.7969C136.478 100.62 137.194 102.212 138.119 103.137C138.148 103.166 138.174 103.197 138.197 103.231C138.737 104.002 139.678 104.694 140.871 105.276C142.052 105.853 143.422 106.291 144.747 106.586C145.124 106.67 145.362 107.044 145.278 107.421C145.194 107.798 144.82 108.036 144.443 107.952C143.04 107.641 141.56 107.17 140.257 106.534C138.985 105.914 137.822 105.107 137.086 104.084C135.913 102.885 135.129 101.013 134.74 99.0715C134.349 97.1143 134.338 94.9785 134.813 93.1957C135.149 90.3083 136.742 87.134 138.886 84.6994C141.031 82.265 143.866 80.4183 146.737 80.504C148.528 80.5574 150.052 81.0681 152.38 81.8478C152.58 81.9149 152.787 81.984 153 82.055C153.366 82.1773 153.565 82.5737 153.442 82.9404C153.32 83.3072 152.924 83.5054 152.557 83.3832C152.368 83.3203 152.186 83.2594 152.01 83.2005C149.596 82.3934 148.271 81.9504 146.696 81.9033C144.433 81.8358 141.964 83.323 139.937 85.6248Z" fill="black"/>
+<path d="M193.724 112.927C192.242 118.643 187.293 125.944 182.51 126.263C172.211 126.949 171.902 119.613 171.902 113.533C172.537 107.817 177.716 100.804 182.51 100.804C189.178 100.804 194.995 103.824 193.724 112.927Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M186.377 107.155C187.38 107.276 188.339 107.985 189.157 109.228C189.369 109.551 189.28 109.985 188.957 110.197C188.634 110.41 188.2 110.32 187.987 109.997C187.292 108.94 186.647 108.598 186.21 108.545C185.796 108.495 185.389 108.684 185.074 109.126C184.433 110.025 184.325 111.858 185.912 113.379C187.88 115.264 188.418 118.001 187.288 119.672C186.695 120.55 185.694 121.026 184.447 120.903C183.239 120.783 181.824 120.11 180.244 118.793C179.947 118.545 179.906 118.104 180.154 117.807C180.401 117.51 180.843 117.47 181.14 117.717C182.61 118.942 183.766 119.428 184.585 119.509C185.365 119.586 185.847 119.304 186.129 118.888C186.748 117.971 186.605 115.981 184.944 114.39C182.902 112.435 182.852 109.832 183.934 108.314C184.481 107.547 185.351 107.032 186.377 107.155Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M187.743 105.888C188.115 105.991 188.333 106.377 188.23 106.75C186.952 111.349 185.166 116.706 183.364 121.61C183.23 121.973 182.828 122.159 182.465 122.026C182.102 121.892 181.916 121.49 182.05 121.127C183.844 116.247 185.616 110.927 186.881 106.375C186.984 106.003 187.37 105.785 187.743 105.888Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M177.409 102.459C177.511 102.086 177.896 101.868 178.269 101.971L182.95 103.272C183.322 103.375 183.541 103.761 183.439 104.134C183.336 104.507 182.951 104.725 182.579 104.622L177.898 103.321C177.526 103.218 177.307 102.832 177.409 102.459ZM179.745 101.177C179.837 100.802 180.216 100.573 180.591 100.666C181.623 100.923 182.186 101.084 182.732 101.241L182.752 101.247C183.284 101.4 183.804 101.549 184.753 101.785C185.129 101.879 185.358 102.259 185.266 102.634C185.174 103.01 184.795 103.238 184.419 103.145C183.446 102.903 182.907 102.748 182.368 102.593L182.349 102.588C181.811 102.433 181.266 102.277 180.257 102.026C179.882 101.933 179.652 101.553 179.745 101.177Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M173.048 107.885C173.153 107.513 173.539 107.298 173.911 107.404L178.154 108.616C178.526 108.723 178.742 109.11 178.637 109.482C178.532 109.854 178.145 110.07 177.774 109.963L173.53 108.751C173.159 108.645 172.943 108.257 173.048 107.885ZM174.274 105.72C174.403 105.356 174.802 105.166 175.167 105.296L179.41 106.812C179.774 106.942 179.965 107.343 179.836 107.707C179.707 108.071 179.307 108.261 178.943 108.131L174.7 106.616C174.335 106.486 174.145 106.085 174.274 105.72ZM175.784 103.916C175.905 103.549 176.301 103.351 176.668 103.473L181.214 104.988C181.581 105.111 181.78 105.507 181.659 105.874C181.538 106.241 181.142 106.44 180.775 106.317L176.229 104.802C175.862 104.68 175.663 104.283 175.784 103.916Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M171.229 112.432C171.334 112.06 171.721 111.844 172.093 111.95L176.336 113.163C176.708 113.269 176.924 113.657 176.819 114.029C176.714 114.401 176.327 114.616 175.955 114.51L171.712 113.298C171.34 113.191 171.124 112.804 171.229 112.432ZM172.138 110.007C172.244 109.635 172.63 109.42 173.002 109.526L177.245 110.738C177.617 110.844 177.833 111.232 177.728 111.604C177.623 111.976 177.236 112.191 176.864 112.085L172.621 110.873C172.249 110.767 172.033 110.379 172.138 110.007ZM170.926 115.766C171.031 115.394 171.418 115.178 171.79 115.284L176.033 116.497C176.404 116.603 176.621 116.991 176.516 117.363C176.41 117.735 176.024 117.95 175.652 117.844L171.409 116.632C171.037 116.525 170.821 116.138 170.926 115.766Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M171.22 118.831C171.306 118.454 171.681 118.219 172.058 118.306L175.998 119.215C176.375 119.302 176.61 119.678 176.525 120.055C176.439 120.432 176.064 120.667 175.687 120.58L171.747 119.671C171.37 119.584 171.135 119.208 171.22 118.831ZM172.436 121.547C172.528 121.171 172.907 120.943 173.283 121.037L176.92 121.946C177.295 122.04 177.524 122.42 177.431 122.795C177.338 123.171 176.959 123.399 176.584 123.305L172.947 122.396C172.572 122.302 172.343 121.922 172.436 121.547Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M180.785 106.766C178.704 109.244 177.18 112.418 176.84 115.136C176.24 119.937 176.882 123.281 178.763 125.162C178.791 125.191 178.818 125.222 178.841 125.255C179.039 125.538 179.375 125.758 179.863 125.896C180.351 126.033 180.943 126.073 181.565 126.028C182.184 125.983 182.803 125.856 183.334 125.683C183.877 125.506 184.274 125.297 184.487 125.12C184.537 125.078 184.593 125.043 184.654 125.016C186.599 124.16 188.38 122.362 189.796 120.064C191.207 117.775 192.217 115.051 192.658 112.436C193.1 109.808 192.953 107.37 192.144 105.607C191.359 103.899 189.943 102.784 187.642 102.716C185.4 102.649 182.887 104.262 180.785 106.766ZM179.713 105.865C181.906 103.253 184.792 101.23 187.684 101.316C190.538 101.402 192.419 102.852 193.416 105.023C194.387 107.138 194.506 109.891 194.038 112.668C193.569 115.458 192.495 118.353 190.988 120.799C189.504 123.205 187.564 125.236 185.303 126.259C184.902 126.569 184.352 126.823 183.768 127.014C183.132 127.222 182.4 127.371 181.666 127.424C180.935 127.477 180.171 127.437 179.483 127.243C178.813 127.054 178.17 126.705 177.732 126.11C175.403 123.743 174.842 119.831 175.451 114.962C175.831 111.92 177.499 108.502 179.713 105.865Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M176.337 105.225C174.323 107.511 172.882 110.451 172.598 113.004C172.594 113.04 172.587 113.076 172.577 113.111C172.157 114.652 172.15 116.585 172.513 118.397C172.878 120.22 173.594 121.812 174.519 122.737C174.548 122.766 174.574 122.797 174.597 122.831C175.137 123.602 176.078 124.294 177.271 124.876C178.452 125.452 179.822 125.891 181.147 126.186C181.524 126.27 181.762 126.643 181.678 127.021C181.594 127.398 181.22 127.636 180.843 127.552C179.439 127.241 177.96 126.77 176.657 126.134C175.385 125.514 174.222 124.707 173.486 123.684C172.313 122.485 171.528 120.613 171.14 118.671C170.749 116.714 170.738 114.579 171.213 112.796C171.549 109.908 173.141 106.734 175.286 104.299C177.431 101.865 180.266 100.018 183.137 100.104C184.928 100.157 186.452 100.668 188.78 101.448C188.98 101.515 189.187 101.584 189.399 101.655C189.766 101.777 189.964 102.174 189.842 102.54C189.72 102.907 189.324 103.105 188.957 102.983C188.768 102.92 188.586 102.859 188.41 102.8C185.996 101.993 184.671 101.55 183.096 101.503C180.833 101.436 178.364 102.923 176.337 105.225Z" fill="black"/>
+<path d="M190.924 52.7271C189.442 58.4431 184.493 65.7442 179.71 66.0629C169.411 66.749 169.102 59.4132 169.102 53.3333C169.737 47.6172 174.916 40.6036 179.71 40.6036C186.378 40.6036 192.195 43.6238 190.924 52.7271Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M183.577 46.9553C184.58 47.0761 185.539 47.7846 186.357 49.0279C186.569 49.3508 186.48 49.7849 186.157 49.9974C185.834 50.2098 185.4 50.1202 185.187 49.7973C184.492 48.7401 183.847 48.3979 183.41 48.3453C182.996 48.2954 182.589 48.4841 182.274 48.9261C181.633 49.8253 181.525 51.6585 183.112 53.1791C185.079 55.0637 185.618 57.8008 184.488 59.472C183.895 60.3496 182.894 60.8257 181.647 60.7026C180.439 60.5833 179.024 59.9102 177.444 58.593C177.147 58.3455 177.106 57.9042 177.354 57.6072C177.601 57.3102 178.043 57.27 178.34 57.5175C179.81 58.7424 180.966 59.2285 181.785 59.3094C182.565 59.3864 183.047 59.1038 183.328 58.6877C183.948 57.7715 183.805 55.7813 182.144 54.1901C180.102 52.2348 180.052 49.6317 181.134 48.1136C181.68 47.3469 182.551 46.8317 183.577 46.9553Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M184.943 45.6881C185.315 45.7915 185.533 46.1774 185.43 46.5499C184.152 51.149 182.366 56.506 180.564 61.4103C180.43 61.7731 180.028 61.9592 179.665 61.8258C179.302 61.6924 179.116 61.2901 179.249 60.9273C181.044 56.0468 182.816 50.7273 184.081 46.1752C184.184 45.8027 184.57 45.5846 184.943 45.6881Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 42.2591C174.711 41.8864 175.096 41.6681 175.469 41.7715L180.149 43.0717C180.522 43.1752 180.741 43.5612 180.639 43.934C180.536 44.3068 180.151 44.5251 179.779 44.4216L175.098 43.1214C174.726 43.018 174.507 42.6319 174.609 42.2591ZM176.945 40.9773C177.037 40.6019 177.416 40.3731 177.791 40.4665C178.823 40.7231 179.386 40.8843 179.932 41.0413L179.952 41.047C180.484 41.1999 181.004 41.3493 181.953 41.5854C182.329 41.6787 182.558 42.0587 182.466 42.4342C182.373 42.8096 181.995 43.0383 181.619 42.945C180.646 42.7028 180.107 42.5481 179.568 42.3932L179.549 42.3878C179.011 42.2332 178.466 42.077 177.457 41.826C177.082 41.7327 176.852 41.3527 176.945 40.9773Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M170.248 47.6853C170.353 47.3133 170.739 47.0979 171.111 47.2041L175.354 48.4164C175.726 48.5227 175.942 48.9103 175.837 49.2823C175.732 49.6543 175.345 49.8698 174.974 49.7635L170.73 48.5512C170.359 48.445 170.142 48.0573 170.248 47.6853ZM171.474 45.5205C171.603 45.1562 172.002 44.9663 172.367 45.0963L176.61 46.6118C176.974 46.7418 177.165 47.1426 177.036 47.507C176.907 47.8713 176.507 48.0612 176.143 47.9312L171.9 46.4157C171.535 46.2856 171.345 45.8848 171.474 45.5205ZM172.984 43.7161C173.105 43.3491 173.501 43.1507 173.868 43.2729L178.414 44.7884C178.781 44.9107 178.98 45.3074 178.859 45.6744C178.738 46.0414 178.342 46.2398 177.975 46.1175L173.429 44.6021C173.062 44.4798 172.863 44.0831 172.984 43.7161Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M168.429 52.2317C168.534 51.8597 168.921 51.6442 169.293 51.7505L173.536 52.9628C173.908 53.069 174.124 53.4567 174.019 53.8287C173.914 54.2007 173.527 54.4161 173.155 54.3099L168.912 53.0976C168.54 52.9913 168.324 52.6037 168.429 52.2317ZM169.338 49.8071C169.443 49.4351 169.83 49.2197 170.202 49.3259L174.445 50.5381C174.817 50.6443 175.033 51.0319 174.928 51.4039C174.823 51.7759 174.436 51.9914 174.064 51.8852L169.821 50.673C169.449 50.5668 169.233 50.1791 169.338 49.8071ZM168.126 55.5657C168.231 55.1937 168.618 54.9783 168.99 55.0845L173.233 56.2969C173.604 56.4031 173.821 56.7908 173.715 57.1627C173.61 57.5347 173.224 57.7502 172.852 57.644L168.609 56.4316C168.237 56.3254 168.021 55.9377 168.126 55.5657Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M168.42 58.6311C168.506 58.2542 168.881 58.019 169.258 58.106L173.198 59.0152C173.575 59.1021 173.81 59.4782 173.725 59.8552C173.639 60.2321 173.264 60.4673 172.887 60.3803L168.947 59.4711C168.57 59.3841 168.335 59.0081 168.42 58.6311ZM169.636 61.3467C169.728 60.9714 170.107 60.7431 170.482 60.8369L174.12 61.746C174.495 61.8398 174.723 62.2201 174.631 62.5954C174.538 62.9707 174.159 63.199 173.784 63.1052L170.147 62.1961C169.772 62.1023 169.543 61.722 169.636 61.3467Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M177.985 46.5656C175.904 49.0441 174.38 52.2185 174.04 54.9356C173.44 59.7368 174.082 63.0814 175.963 64.9618C175.991 64.9906 176.018 65.0219 176.041 65.0553C176.239 65.3376 176.575 65.558 177.063 65.6956C177.551 65.8332 178.142 65.8732 178.765 65.828C179.384 65.7831 180.003 65.6562 180.534 65.483C181.077 65.3058 181.474 65.0973 181.687 64.9198C181.737 64.8776 181.793 64.8427 181.854 64.8161C183.799 63.9603 185.58 62.1618 186.996 59.8642C188.407 57.5751 189.417 54.851 189.858 52.2359C190.3 49.6076 190.153 47.17 189.344 45.407C188.559 43.6993 187.143 42.5845 184.842 42.5158C182.6 42.4489 180.087 44.0625 177.985 46.5656ZM176.913 45.6653C179.106 43.0535 181.992 41.0301 184.884 41.1164C187.738 41.2016 189.619 42.6522 190.616 44.8228C191.587 46.938 191.706 49.6915 191.238 52.4683C190.769 55.2584 189.695 58.1534 188.188 60.5988C186.704 63.0055 184.764 65.036 182.503 66.0595C182.102 66.3688 181.552 66.6234 180.968 66.8139C180.332 67.0217 179.6 67.1711 178.866 67.2244C178.135 67.2774 177.371 67.2372 176.683 67.043C176.013 66.8541 175.37 66.5055 174.932 65.9105C172.603 63.5433 172.042 59.6312 172.651 54.7619C173.031 51.7204 174.699 48.3018 176.913 45.6653Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M173.537 45.0248C171.523 47.3111 170.082 50.2507 169.798 52.8044C169.794 52.8405 169.787 52.8763 169.777 52.9113C169.357 54.4519 169.35 56.3849 169.713 58.1969C170.077 60.0201 170.794 61.6119 171.719 62.5371C171.748 62.5659 171.774 62.5972 171.797 62.6306C172.337 63.4016 173.278 64.0944 174.471 64.6761C175.652 65.2525 177.022 65.6915 178.347 65.9858C178.724 66.0696 178.962 66.4435 178.878 66.8209C178.794 67.1983 178.42 67.4363 178.043 67.3524C176.639 67.0405 175.16 66.5702 173.857 65.9343C172.585 65.3138 171.422 64.5074 170.686 63.4837C169.513 62.2851 168.728 60.4133 168.34 58.4715C167.949 56.5143 167.938 54.3786 168.413 52.5957C168.749 49.7084 170.341 46.5341 172.486 44.0994C174.631 41.665 177.466 39.8183 180.337 39.904C182.128 39.9574 183.652 40.4682 185.98 41.2478C186.18 41.3149 186.387 41.384 186.599 41.455C186.966 41.5773 187.164 41.9737 187.042 42.3405C186.92 42.7072 186.523 42.9054 186.157 42.7832C185.968 42.7204 185.786 42.6595 185.61 42.6005C183.196 41.7934 181.87 41.3504 180.295 41.3034C178.033 41.2358 175.564 42.723 173.537 45.0248Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M144.9 21.4006C145.287 21.4006 145.6 21.714 145.6 22.1006L145.6 61.9729C145.6 62.3595 145.287 62.6729 144.9 62.6729C144.513 62.6729 144.2 62.3595 144.2 61.9729L144.2 22.1006C144.2 21.714 144.513 21.4006 144.9 21.4006ZM144.9 115.458C145.287 115.458 145.6 115.772 145.6 116.158L145.6 140.4C145.6 140.787 145.287 141.1 144.9 141.1C144.513 141.1 144.2 140.787 144.2 140.4L144.2 116.158C144.2 115.772 144.513 115.458 144.9 115.458ZM144.9 160.442C145.287 160.442 145.6 160.756 145.6 161.142L145.6 176.1C145.6 176.487 145.287 176.8 144.9 176.8C144.513 176.8 144.2 176.487 144.2 176.1L144.2 161.142C144.2 160.756 144.513 160.442 144.9 160.442Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M163.1 21.4006C163.486 21.4006 163.8 21.714 163.8 22.1006L163.8 52.6633C163.8 53.0499 163.487 53.3633 163.1 53.3633C162.713 53.3633 162.4 53.0499 162.4 52.6633L162.4 22.1006C162.4 21.714 162.713 21.4006 163.1 21.4006ZM163.1 74.8852C163.487 74.8852 163.8 75.1987 163.8 75.5852L163.8 97.4157C163.8 97.8023 163.487 98.1157 163.1 98.1157C162.713 98.1157 162.4 97.8023 162.4 97.4157L162.4 75.5852C162.4 75.1987 162.713 74.8852 163.1 74.8852ZM163.1 125.095C163.487 125.095 163.8 125.409 163.8 125.795L163.8 150.9C163.8 151.287 163.487 151.6 163.1 151.6C162.713 151.6 162.4 151.287 162.4 150.9L162.4 125.795C162.4 125.409 162.713 125.095 163.1 125.095Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M178.506 7.40072C178.893 7.4042 179.203 7.72041 179.2 8.10699L178.936 37.4062C178.932 37.7927 178.616 38.1033 178.23 38.0998C177.843 38.0963 177.532 37.7801 177.536 37.3936L177.8 8.09438C177.803 7.7078 178.12 7.39723 178.506 7.40072ZM177.945 69.6615C178.332 69.6649 178.642 69.9812 178.639 70.3677L178.408 96.0045C178.404 96.3911 178.088 96.7017 177.702 96.6982C177.315 96.6947 177.004 96.3785 177.008 95.9919L177.239 70.3551C177.242 69.9685 177.559 69.658 177.945 69.6615ZM177.378 131.922C177.765 131.922 178.078 132.236 178.078 132.622L178.078 160C178.078 160.387 177.765 160.7 177.378 160.7C176.991 160.7 176.678 160.387 176.678 160L176.678 132.622C176.678 132.236 176.991 131.922 177.378 131.922Z" fill="black"/>
+<path d="M376.833 27.7006V4.36731L417.899 9.9673V33.3006L376.833 27.7006Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M376.109 0.817627C376.496 0.817627 376.809 1.13103 376.809 1.51763V78.1004C376.809 78.487 376.496 78.8004 376.109 78.8004C375.722 78.8004 375.409 78.487 375.409 78.1004V1.51763C375.409 1.13103 375.722 0.817627 376.109 0.817627Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M373.099 0C373.486 0 373.799 0.3134 373.799 0.699998V79.5004C373.799 79.887 373.486 80.2004 373.099 80.2004C372.713 80.2004 372.399 79.887 372.399 79.5004V0.699998C372.399 0.3134 372.713 0 373.099 0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M372.408 1.40574C372.47 1.0241 372.829 0.764748 373.211 0.826465C376.874 1.41887 385.844 2.43835 395.358 3.51706L395.756 3.56212C405.134 4.62534 414.96 5.73939 420.616 6.54733C420.999 6.60201 421.264 6.95658 421.21 7.33929C421.155 7.722 420.801 7.98793 420.418 7.93326C414.783 7.12823 404.97 6.01577 395.575 4.95059L395.2 4.90815C385.71 3.83214 376.693 2.80777 372.988 2.20851C372.606 2.14679 372.347 1.78738 372.408 1.40574Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M375.675 24.3232C375.722 23.9395 376.071 23.6665 376.455 23.7135C386.46 24.9387 397.412 26.4715 407.878 27.9364C411.437 28.4346 414.94 28.9248 418.331 29.3925C418.713 29.4453 418.981 29.7986 418.928 30.1815C418.875 30.5645 418.522 30.8322 418.139 30.7793C414.742 30.3108 411.235 29.82 407.674 29.3215C397.211 27.857 386.277 26.3267 376.284 25.1031C375.901 25.0561 375.628 24.707 375.675 24.3232Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M417.246 4.90491C417.633 4.9049 417.946 5.2183 417.946 5.6049C417.947 16.233 417.946 25.226 417.946 30.4451C417.946 30.8317 417.633 31.1451 417.246 31.1451C416.86 31.145 416.546 30.8316 416.546 30.445C416.546 25.226 416.547 16.233 416.546 5.60491C416.546 5.21831 416.86 4.90491 417.246 4.90491Z" fill="black"/>
+<path d="M346.462 203.811V190.576L366.836 183.655L410.971 182.997L422.084 192.71V206.586L405.433 215.605H363.113L346.462 203.811Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M341.757 199.821C342.001 199.521 342.442 199.477 342.742 199.721C346.939 203.147 350.087 205.812 353.006 208.284L353.007 208.284C355.927 210.756 358.616 213.033 361.903 215.689C362.204 215.932 362.251 216.373 362.008 216.673C361.765 216.974 361.324 217.021 361.023 216.778C357.723 214.111 355.023 211.825 352.105 209.355L352.103 209.353C349.183 206.882 346.043 204.223 341.856 200.806C341.557 200.561 341.512 200.12 341.757 199.821Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M406.681 216.304C396.908 216.154 370.596 215.748 361.715 215.611C361.328 215.605 361.02 215.286 361.026 214.9C361.032 214.513 361.35 214.205 361.736 214.211C370.617 214.348 396.93 214.754 406.703 214.905C407.089 214.911 407.398 215.229 407.392 215.615C407.386 216.002 407.068 216.31 406.681 216.304Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M346.668 186.597C347.054 186.597 347.368 186.911 347.368 187.297L347.368 207.973C347.368 208.36 347.054 208.673 346.668 208.673C346.281 208.673 345.968 208.36 345.968 207.973L345.968 187.297C345.968 186.911 346.281 186.597 346.668 186.597Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M363.113 197.561C363.499 197.561 363.813 197.874 363.813 198.261V214.218C363.813 214.604 363.499 214.918 363.113 214.918C362.726 214.918 362.413 214.604 362.413 214.218V198.261C362.413 197.874 362.726 197.561 363.113 197.561Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M405.433 196.866C405.82 196.866 406.133 197.179 406.133 197.566V216.992C406.133 217.378 405.82 217.692 405.433 217.692C405.047 217.692 404.733 217.378 404.733 216.992V197.566C404.733 197.179 405.047 196.866 405.433 196.866Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M422.084 187.154C422.471 187.154 422.784 187.467 422.784 187.854V207.28C422.784 207.666 422.471 207.98 422.084 207.98C421.698 207.98 421.384 207.666 421.384 207.28V187.854C421.384 187.467 421.698 187.154 422.084 187.154Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M344.904 188.706C345.114 188.381 345.547 188.287 345.872 188.496C352.046 192.464 354.381 193.94 357.225 195.737C358.856 196.767 360.653 197.902 363.436 199.673C363.762 199.881 363.859 200.313 363.651 200.639C363.443 200.966 363.011 201.062 362.685 200.854C359.909 199.088 358.113 197.953 356.483 196.923C353.635 195.124 351.292 193.644 345.115 189.673C344.79 189.464 344.695 189.031 344.904 188.706Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M362.36 200.264C362.36 199.877 362.674 199.564 363.06 199.564C371.256 199.564 397.056 199.564 406.075 199.564C406.461 199.564 406.775 199.877 406.775 200.264C406.775 200.65 406.462 200.964 406.075 200.964C397.056 200.964 371.256 200.964 363.06 200.964C362.674 200.964 362.36 200.65 362.36 200.264Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M406.414 179.886C406.643 179.575 407.081 179.507 407.392 179.736L406.978 180.3L406.564 180.865C406.253 180.636 406.185 180.198 406.414 179.886ZM406.978 180.3C406.564 180.865 406.564 180.865 406.564 180.865L407.09 181.25C407.429 181.498 407.919 181.857 408.524 182.3C409.734 183.186 411.406 184.409 413.253 185.757C416.946 188.451 421.341 191.647 424.139 193.646C424.453 193.871 424.89 193.798 425.115 193.483C425.34 193.169 425.267 192.731 424.952 192.507C422.161 190.513 417.772 187.321 414.078 184.626C412.232 183.278 410.561 182.056 409.351 181.17C408.746 180.727 408.256 180.369 407.918 180.121L407.392 179.736C407.392 179.736 407.392 179.736 406.978 180.3Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.105 180.878C374.227 181.245 374.029 181.641 373.662 181.764C366.485 184.156 348.932 190.539 344.955 192.13C344.596 192.274 344.188 192.099 344.045 191.74C343.901 191.381 344.076 190.974 344.435 190.83C348.443 189.227 366.024 182.834 373.22 180.435C373.586 180.313 373.983 180.511 374.105 180.878Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M392.318 183.27C383.416 183.333 374.469 183.396 365.456 183.396C365.069 183.396 364.756 183.082 364.756 182.696C364.756 182.309 365.069 181.996 365.456 181.996C374.463 181.996 383.405 181.933 392.308 181.87L392.435 181.869C401.295 181.807 410.116 181.745 418.919 181.745C419.305 181.745 419.619 182.059 419.619 182.445C419.619 182.832 419.305 183.145 418.919 183.145C410.121 183.145 401.304 183.207 392.443 183.269L392.318 183.27Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M426.925 190.369C427.098 190.714 426.958 191.135 426.612 191.308C421.29 193.969 416.495 196.128 411.899 198.198C409.301 199.368 406.767 200.509 404.238 201.696C403.888 201.86 403.471 201.709 403.307 201.36C403.143 201.01 403.293 200.593 403.643 200.428C406.212 199.223 408.763 198.074 411.367 196.902C415.942 194.842 420.683 192.707 425.986 190.055C426.332 189.883 426.752 190.023 426.925 190.369ZM425.485 205.58C425.658 205.926 425.518 206.346 425.172 206.519L425.166 206.522C416.845 210.683 411.288 213.461 404.238 216.769C403.888 216.934 403.471 216.783 403.307 216.433C403.143 216.083 403.293 215.666 403.643 215.502C410.677 212.201 416.22 209.43 424.546 205.267C424.892 205.094 425.312 205.234 425.485 205.58Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M352.21 192.732C352.581 192.841 352.793 193.231 352.684 193.601L349.214 205.396C349.105 205.767 348.716 205.979 348.345 205.87C347.975 205.761 347.762 205.372 347.871 205.001L351.341 193.206C351.45 192.836 351.839 192.623 352.21 192.732ZM357.043 195.501C357.418 195.598 357.643 195.979 357.547 196.354C356.993 198.502 356.2 200.717 355.425 202.883L355.418 202.9C354.64 205.074 353.879 207.198 353.358 209.222C353.261 209.596 352.879 209.821 352.505 209.725C352.131 209.629 351.905 209.247 352.002 208.872C352.54 206.786 353.318 204.611 354.088 202.463L354.107 202.411C354.887 200.232 355.656 198.079 356.191 196.004C356.287 195.63 356.669 195.405 357.043 195.501ZM361.937 198.981C362.306 199.098 362.509 199.491 362.392 199.86L358.138 213.252C358.021 213.62 357.627 213.824 357.259 213.707C356.89 213.59 356.687 213.196 356.804 212.828L361.058 199.436C361.175 199.067 361.569 198.864 361.937 198.981Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M380.313 199.663C380.687 199.76 380.912 200.141 380.816 200.516C380.186 202.959 379.582 205.389 378.981 207.809L378.971 207.851C378.373 210.256 377.778 212.651 377.164 215.034C377.067 215.408 376.686 215.633 376.311 215.537C375.937 215.44 375.712 215.059 375.808 214.684C376.421 212.308 377.015 209.917 377.613 207.51L377.622 207.472C378.223 205.052 378.829 202.616 379.46 200.166C379.556 199.792 379.938 199.567 380.313 199.663ZM374.388 199.663C374.762 199.76 374.987 200.141 374.891 200.516C374.257 202.975 373.579 205.399 372.907 207.799L372.895 207.843C372.226 210.23 371.564 212.594 370.955 214.96C370.858 215.334 370.477 215.56 370.102 215.463C369.728 215.367 369.503 214.985 369.599 214.611C370.212 212.231 370.877 209.855 371.545 207.472L371.559 207.422C372.231 205.019 372.905 202.609 373.535 200.166C373.631 199.792 374.013 199.567 374.388 199.663ZM367.836 200.36C368.208 200.464 368.426 200.85 368.322 201.223L364.48 214.974C364.376 215.346 363.99 215.564 363.618 215.459C363.245 215.355 363.028 214.969 363.132 214.597L366.973 200.846C367.077 200.474 367.464 200.256 367.836 200.36Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M397.394 200.363C397.769 200.46 397.994 200.841 397.898 201.216L394.317 215.11C394.22 215.485 393.839 215.71 393.464 215.613C393.09 215.517 392.865 215.135 392.961 214.761L396.542 200.866C396.638 200.492 397.02 200.267 397.394 200.363ZM391.15 200.363C391.525 200.46 391.75 200.841 391.653 201.216L388.073 215.11C387.976 215.484 387.595 215.71 387.22 215.613C386.846 215.517 386.621 215.135 386.717 214.761L390.298 200.866C390.394 200.492 390.776 200.267 391.15 200.363ZM385.6 200.338C385.974 200.435 386.2 200.817 386.103 201.191L382.523 215.085C382.426 215.46 382.044 215.685 381.67 215.588C381.296 215.492 381.07 215.11 381.167 214.736L384.747 200.842C384.844 200.467 385.226 200.242 385.6 200.338Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M416.17 194.807C416.544 194.904 416.77 195.285 416.673 195.66L412.561 211.617C412.465 211.991 412.083 212.216 411.709 212.12C411.334 212.023 411.109 211.642 411.205 211.267L415.317 195.31C415.414 194.936 415.796 194.711 416.17 194.807ZM409.794 198.283C410.165 198.392 410.377 198.782 410.267 199.152L405.343 215.803C405.233 216.174 404.844 216.386 404.473 216.276C404.103 216.166 403.891 215.777 404.001 215.406L408.925 198.755C409.034 198.385 409.424 198.173 409.794 198.283ZM403.23 200.357C403.604 200.454 403.829 200.836 403.733 201.21L399.978 215.779C399.882 216.154 399.5 216.379 399.126 216.282C398.751 216.186 398.526 215.804 398.623 215.43L402.377 200.861C402.474 200.486 402.855 200.261 403.23 200.357Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M421.719 192.033C422.094 192.13 422.318 192.512 422.221 192.886L417.905 209.537C417.808 209.911 417.426 210.136 417.052 210.039C416.678 209.942 416.453 209.56 416.55 209.185L420.866 192.535C420.963 192.16 421.345 191.936 421.719 192.033Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M379.27 190.973H373.796L367.904 183.705L371.558 179.863V170.187H367.904L371.558 157.518H375.617L379.27 154.271V147.776L388.2 142.905L393.071 146.178V151.835L396.319 146.178L403.064 149.4L404.843 157.518L400.784 161.172V167.666H404.843L403.064 179.863L397.806 178.419L393.071 183.705L394.503 190.973L386.574 194.277L379.27 192.955V190.973ZM383.508 168.098L388.523 164.754L391.866 166.426L389.637 173.112L385.737 175.898L383.508 174.784V168.098Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M367.285 169.574C367.405 169.207 367.801 169.007 368.168 169.127C368.767 169.324 369.368 169.448 370.037 169.575C372.022 169.953 374.01 170.284 376.008 170.617C376.932 170.77 377.858 170.925 378.787 171.084C379.168 171.149 379.424 171.511 379.359 171.892C379.293 172.273 378.931 172.529 378.55 172.464C377.636 172.307 376.718 172.154 375.797 172.001C373.792 171.667 371.777 171.331 369.776 170.95C369.102 170.822 368.423 170.684 367.732 170.457C367.364 170.337 367.164 169.941 367.285 169.574Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M369.24 157.159C369.302 156.778 369.661 156.518 370.042 156.579C370.751 156.693 371.42 156.821 372.146 157.048C374.372 157.742 376.584 158.509 378.783 159.271C379.784 159.617 380.781 159.963 381.776 160.301C382.142 160.425 382.338 160.822 382.214 161.188C382.089 161.554 381.692 161.75 381.326 161.626C380.312 161.282 379.305 160.933 378.3 160.585C376.111 159.827 373.934 159.072 371.729 158.384C371.097 158.187 370.503 158.071 369.82 157.962C369.439 157.9 369.179 157.541 369.24 157.159Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M378.003 147.236C378.124 146.869 378.52 146.669 378.887 146.79C381.196 147.55 383.558 148.135 385.942 148.725C386.936 148.971 387.934 149.218 388.933 149.48C389.307 149.577 389.531 149.96 389.433 150.334C389.336 150.708 388.953 150.932 388.579 150.834C387.618 150.583 386.642 150.341 385.66 150.098C383.254 149.502 380.811 148.897 378.449 148.119C378.082 147.999 377.882 147.603 378.003 147.236Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M385.398 142.256C385.532 141.894 385.935 141.709 386.297 141.844C388.632 142.711 390.984 143.529 393.344 144.349C393.873 144.533 394.402 144.717 394.931 144.902C395.296 145.029 395.489 145.428 395.362 145.793C395.234 146.158 394.835 146.351 394.47 146.224C393.944 146.04 393.417 145.857 392.889 145.673C390.529 144.853 388.16 144.029 385.81 143.156C385.448 143.022 385.263 142.619 385.398 142.256Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M395.191 146.211C395.28 145.835 395.658 145.603 396.034 145.693C397.888 146.134 399.725 146.758 401.517 147.366C402.206 147.6 402.889 147.831 403.563 148.05C403.931 148.169 404.133 148.563 404.014 148.931C403.895 149.299 403.5 149.501 403.132 149.382C402.416 149.15 401.708 148.91 401.005 148.671C399.237 148.071 397.496 147.48 395.709 147.055C395.333 146.965 395.101 146.588 395.191 146.211Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M400.507 167.642C400.6 167.267 400.979 167.038 401.354 167.13C402.083 167.31 402.816 167.489 403.549 167.668C404.41 167.879 405.272 168.089 406.129 168.301C406.504 168.394 406.733 168.773 406.64 169.149C406.548 169.524 406.168 169.753 405.793 169.66C404.933 169.448 404.077 169.239 403.221 169.029C402.489 168.85 401.756 168.671 401.02 168.489C400.644 168.397 400.415 168.018 400.507 167.642Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M397.352 178.371C397.439 177.995 397.815 177.76 398.192 177.847C399.417 178.13 400.643 178.451 401.856 178.769C402.414 178.915 402.97 179.061 403.522 179.202C403.896 179.297 404.123 179.679 404.027 180.053C403.931 180.428 403.55 180.654 403.176 180.558C402.605 180.413 402.039 180.264 401.476 180.117C400.273 179.801 399.082 179.489 397.877 179.211C397.5 179.124 397.265 178.748 397.352 178.371Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M394.14 182.612C394.522 182.551 394.881 182.81 394.942 183.192C395.017 183.659 395.065 184.091 395.076 184.589C395.115 186.347 395.091 188.115 395.068 189.868C395.057 190.688 395.046 191.504 395.041 192.314C395.039 192.701 394.724 193.013 394.337 193.011C393.951 193.008 393.639 192.693 393.641 192.307C393.646 191.472 393.657 190.643 393.668 189.818C393.692 188.078 393.715 186.353 393.676 184.62C393.667 184.201 393.627 183.834 393.56 183.414C393.499 183.033 393.758 182.673 394.14 182.612Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M386.54 187.019C386.925 186.989 387.262 187.277 387.292 187.662C387.414 189.213 387.448 190.803 387.481 192.369C387.502 193.345 387.523 194.312 387.564 195.252C387.581 195.639 387.282 195.966 386.896 195.983C386.509 196 386.183 195.7 386.165 195.314C386.121 194.301 386.1 193.308 386.08 192.325C386.048 190.8 386.016 189.297 385.897 187.772C385.866 187.386 386.154 187.049 386.54 187.019Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M383.824 186.93C384.11 187.191 384.13 187.633 383.869 187.919C383.47 188.354 383.077 188.812 382.674 189.283C382.641 189.321 382.609 189.359 382.577 189.396C382.206 189.829 381.828 190.272 381.439 190.706C380.594 191.648 379.678 192.576 378.626 193.33C378.311 193.555 377.874 193.483 377.649 193.168C377.424 192.854 377.496 192.417 377.81 192.192C378.74 191.525 379.577 190.686 380.396 189.771C380.774 189.35 381.142 188.92 381.515 188.484C381.546 188.447 381.578 188.41 381.61 188.373C382.012 187.903 382.42 187.429 382.835 186.974C383.096 186.689 383.539 186.669 383.824 186.93Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M380.624 179.045C380.886 179.329 380.868 179.772 380.584 180.034C380.007 180.566 379.422 181.078 378.843 181.585C377.392 182.856 375.976 184.096 374.798 185.546C374.554 185.846 374.113 185.891 373.813 185.647C373.513 185.404 373.468 184.963 373.711 184.663C374.969 183.114 376.525 181.753 378.008 180.453C378.567 179.964 379.116 179.483 379.635 179.005C379.919 178.743 380.362 178.761 380.624 179.045Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M378.974 170.004C379.354 170.073 379.607 170.438 379.538 170.818C378.886 174.404 379.455 178.004 379.808 180.239C379.832 180.388 379.854 180.532 379.876 180.668C379.935 181.05 379.674 181.408 379.292 181.468C378.91 181.527 378.552 181.265 378.492 180.883C378.471 180.743 378.447 180.595 378.422 180.438C378.069 178.216 377.464 174.398 378.16 170.568C378.229 170.187 378.594 169.935 378.974 170.004Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.747 155.941C387.934 156.279 387.813 156.705 387.475 156.892C384.357 158.625 383.181 160.24 382.334 161.68C382.138 162.013 381.709 162.124 381.375 161.928C381.042 161.732 380.931 161.303 381.127 160.97C382.081 159.347 383.428 157.539 386.795 155.669C387.133 155.481 387.559 155.603 387.747 155.941Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M386.61 148.286C386.996 148.294 387.303 148.615 387.295 149.001C387.285 149.449 387.275 149.897 387.265 150.345C387.203 153.14 387.142 155.929 387.115 158.721C387.111 159.107 386.794 159.418 386.408 159.414C386.021 159.41 385.711 159.093 385.715 158.707C385.742 155.906 385.804 153.107 385.865 150.313C385.875 149.866 385.885 149.418 385.895 148.971C385.903 148.584 386.223 148.278 386.61 148.286Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M393.349 144.953C393.736 144.953 394.049 145.266 394.049 145.653V153.669C394.049 154.056 393.736 154.369 393.349 154.369C392.963 154.369 392.649 154.056 392.649 153.669V145.653C392.649 145.266 392.963 144.953 393.349 144.953Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M391.749 152.95C391.749 152.563 392.062 152.25 392.449 152.25C393.276 152.25 394.277 152.37 395.229 152.692C396.177 153.012 397.129 153.55 397.783 154.421C398.015 154.73 397.952 155.169 397.643 155.401C397.334 155.633 396.895 155.57 396.663 155.261C396.235 154.691 395.566 154.283 394.781 154.018C393.999 153.754 393.153 153.65 392.449 153.65C392.062 153.65 391.749 153.336 391.749 152.95Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M404.837 146.242C405.108 146.517 405.105 146.96 404.83 147.232C404.171 147.883 403.512 148.535 402.853 149.189C401.316 150.712 399.775 152.239 398.221 153.747C397.775 154.179 397.341 154.568 396.832 154.95C396.523 155.182 396.084 155.119 395.852 154.81C395.62 154.501 395.683 154.062 395.992 153.83C396.438 153.496 396.825 153.149 397.246 152.742C398.795 151.239 400.327 149.721 401.861 148.2C402.522 147.546 403.183 146.89 403.847 146.236C404.122 145.964 404.565 145.967 404.837 146.242Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M406.814 155.065C407.088 155.337 407.09 155.78 406.818 156.055C406.282 156.596 405.744 157.127 405.209 157.654C404.049 158.799 402.903 159.93 401.815 161.127C401.676 161.279 401.576 161.452 401.467 161.699C401.31 162.053 400.897 162.213 400.543 162.057C400.19 161.901 400.03 161.487 400.186 161.134C400.326 160.817 400.499 160.493 400.779 160.185C401.893 158.96 403.084 157.784 404.259 156.625C404.787 156.104 405.311 155.586 405.824 155.069C406.096 154.795 406.539 154.792 406.814 155.065Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M401.747 147.565C402.085 147.376 402.511 147.498 402.699 147.835C403.173 148.685 403.383 149.529 403.592 150.367C403.604 150.414 403.616 150.461 403.628 150.508C403.812 151.246 403.974 151.97 404.134 152.685C404.405 153.895 404.669 155.078 405.029 156.259C405.04 156.295 405.051 156.324 405.061 156.346C405.064 156.352 405.066 156.357 405.068 156.361C405.398 156.504 405.57 156.877 405.454 157.225C405.332 157.591 404.935 157.79 404.569 157.667C403.994 157.476 403.778 156.955 403.69 156.667C403.317 155.445 403.029 154.158 402.748 152.906C402.591 152.203 402.436 151.512 402.269 150.848C402.262 150.819 402.255 150.789 402.247 150.76C402.027 149.879 401.857 149.2 401.476 148.517C401.288 148.179 401.409 147.753 401.747 147.565Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M400.675 159.921C401.052 159.837 401.426 160.075 401.51 160.452C402.238 163.731 402.496 166.166 401.484 168.95C401.352 169.313 400.951 169.501 400.587 169.369C400.224 169.236 400.036 168.835 400.169 168.472C401.041 166.073 400.856 163.963 400.143 160.756C400.059 160.379 400.297 160.005 400.675 159.921Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M404.411 167.749C404.793 167.689 405.151 167.951 405.211 168.333C405.549 170.506 405.135 172.984 404.531 175.231C403.988 177.247 403.272 179.144 402.744 180.544C402.68 180.712 402.62 180.873 402.562 181.026C402.426 181.388 402.023 181.571 401.661 181.436C401.299 181.3 401.116 180.897 401.251 180.535C401.31 180.379 401.371 180.217 401.434 180.049C401.964 178.644 402.655 176.813 403.179 174.868C403.768 172.679 404.12 170.428 403.827 168.548C403.768 168.166 404.029 167.808 404.411 167.749Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M398.375 176.615C398.736 176.754 398.916 177.159 398.777 177.52C398.151 179.147 397.559 180.397 396.762 181.527C395.964 182.658 394.982 183.636 393.611 184.748C393.31 184.991 392.869 184.945 392.626 184.645C392.383 184.344 392.429 183.904 392.729 183.66C394.041 182.597 394.919 181.71 395.619 180.719C396.32 179.726 396.863 178.596 397.47 177.017C397.609 176.656 398.014 176.476 398.375 176.615Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M396.297 190.288C396.449 190.643 396.285 191.054 395.929 191.207C394.398 191.863 393.251 192.34 392.286 192.742C390.463 193.501 389.288 193.99 387.389 194.908C386.778 195.203 386.338 195.33 385.718 195.433C385.337 195.497 384.976 195.239 384.913 194.858C384.849 194.477 385.107 194.116 385.488 194.052C385.991 193.968 386.302 193.878 386.78 193.647C388.713 192.713 389.936 192.204 391.786 191.434C392.75 191.032 393.884 190.56 395.378 189.92C395.733 189.768 396.145 189.932 396.297 190.288Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M379.415 193.118C379.466 192.735 379.818 192.466 380.201 192.516C381.451 192.682 382.684 192.971 383.877 193.251C384.009 193.282 384.141 193.313 384.272 193.343C385.602 193.653 386.888 193.936 388.184 194.044C388.569 194.076 388.855 194.414 388.823 194.8C388.791 195.185 388.453 195.471 388.068 195.439C386.659 195.322 385.283 195.017 383.954 194.707C383.823 194.676 383.692 194.645 383.562 194.615C382.358 194.333 381.194 194.06 380.017 193.904C379.634 193.853 379.365 193.502 379.415 193.118Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M379.74 189.727C380.122 189.672 380.477 189.938 380.531 190.321C380.583 190.679 380.631 191.034 380.68 191.386C380.775 192.083 380.87 192.771 380.98 193.462C381.041 193.844 380.781 194.203 380.399 194.264C380.018 194.325 379.659 194.065 379.598 193.683C379.485 192.977 379.387 192.262 379.29 191.555C379.242 191.207 379.194 190.861 379.146 190.519C379.091 190.136 379.357 189.782 379.74 189.727Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M378.583 158.632C378.877 158.884 378.911 159.326 378.659 159.619C377.688 160.752 376.819 162.872 376.24 165.23C375.666 167.571 375.412 170.009 375.582 171.704C375.62 172.089 375.339 172.432 374.955 172.47C374.57 172.509 374.227 172.228 374.188 171.843C373.998 169.936 374.284 167.329 374.881 164.897C375.473 162.481 376.406 160.097 377.596 158.708C377.848 158.414 378.29 158.38 378.583 158.632Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M372.698 156.748C373.038 156.933 373.163 157.358 372.978 157.697C370.852 161.594 369.362 166.116 369.46 170.407C369.469 170.793 369.163 171.114 368.776 171.123C368.39 171.131 368.069 170.825 368.06 170.439C367.955 165.824 369.55 161.057 371.749 157.027C371.934 156.688 372.359 156.563 372.698 156.748Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M379.621 154.982C379.89 155.26 379.883 155.703 379.605 155.972C379.315 156.253 379.025 156.538 378.732 156.824C377.78 157.757 376.811 158.706 375.798 159.598C375.508 159.853 375.065 159.825 374.81 159.535C374.554 159.245 374.583 158.802 374.873 158.547C375.855 157.682 376.787 156.769 377.734 155.842C378.031 155.551 378.329 155.259 378.631 154.967C378.909 154.698 379.352 154.705 379.621 154.982Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M379.299 147.026C379.686 147.026 379.999 147.339 379.999 147.726C379.999 149.106 379.947 150.495 379.895 151.868C379.871 152.5 379.847 153.128 379.829 153.751L379.828 153.778C379.817 154.149 379.814 154.261 379.873 154.44C379.996 154.807 379.797 155.203 379.431 155.325C379.064 155.448 378.667 155.249 378.545 154.883C378.404 154.46 378.416 154.11 378.427 153.795C378.428 153.767 378.429 153.738 378.43 153.71C378.449 153.062 378.473 152.421 378.497 151.782C378.549 150.423 378.599 149.08 378.599 147.726C378.599 147.339 378.913 147.026 379.299 147.026Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M377.458 154.907C377.571 154.537 377.962 154.329 378.332 154.441C379.774 154.881 381.065 155.197 382.315 155.504C382.388 155.522 382.46 155.54 382.532 155.557C383.847 155.88 385.127 156.199 386.463 156.645C386.83 156.767 387.028 157.164 386.906 157.53C386.784 157.897 386.387 158.095 386.021 157.973C384.744 157.548 383.515 157.24 382.199 156.917C382.125 156.899 382.05 156.88 381.975 156.862C380.729 156.557 379.404 156.232 377.924 155.781C377.554 155.668 377.345 155.277 377.458 154.907Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M397.695 144.705C398.019 144.916 398.11 145.35 397.899 145.674C397.431 146.392 396.963 147.106 396.495 147.82C395.607 149.173 394.722 150.523 393.849 151.885C393.64 152.21 393.207 152.305 392.882 152.096C392.556 151.887 392.462 151.454 392.67 151.129C393.547 149.762 394.439 148.401 395.33 147.044C395.797 146.331 396.263 145.62 396.727 144.909C396.938 144.586 397.371 144.494 397.695 144.705Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M388.659 142.361C388.836 142.705 388.699 143.127 388.355 143.303C387.237 143.876 386.115 144.429 384.996 144.98C382.694 146.113 380.408 147.24 378.208 148.511C377.874 148.704 377.445 148.589 377.252 148.255C377.059 147.92 377.173 147.492 377.508 147.298C379.747 146.005 382.106 144.842 384.432 143.697C385.54 143.15 386.641 142.608 387.717 142.057C388.061 141.881 388.483 142.017 388.659 142.361Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M397.098 143.664C397.301 143.993 397.198 144.424 396.869 144.627C395.287 145.6 393.658 146.498 392.048 147.386C391.703 147.576 391.359 147.766 391.017 147.956C390.587 148.194 390.151 148.443 389.709 148.696C388.422 149.433 387.083 150.199 385.701 150.798C385.347 150.952 384.935 150.789 384.781 150.434C384.627 150.079 384.79 149.667 385.145 149.513C386.449 148.948 387.688 148.239 388.955 147.514C389.411 147.253 389.871 146.99 390.338 146.731C390.686 146.538 391.034 146.346 391.381 146.155C392.991 145.267 394.585 144.389 396.135 143.435C396.464 143.232 396.896 143.335 397.098 143.664Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M372.904 170.803C373.291 170.803 373.604 171.117 373.604 171.503C373.604 172.692 373.692 173.881 373.782 175.101L373.783 175.114C373.873 176.321 373.964 177.557 373.964 178.799C373.964 179.186 373.651 179.499 373.264 179.499C372.878 179.499 372.564 179.186 372.564 178.799C372.564 177.612 372.477 176.424 372.386 175.204L372.385 175.193C372.296 173.985 372.204 172.748 372.204 171.503C372.204 171.117 372.518 170.803 372.904 170.803Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M371.759 178.471C371.852 178.096 372.232 177.868 372.607 177.962C374.271 178.378 375.788 178.719 377.64 179.136C378.572 179.346 379.588 179.574 380.751 179.841C381.128 179.928 381.363 180.303 381.277 180.68C381.19 181.057 380.815 181.292 380.438 181.206C379.291 180.943 378.282 180.715 377.352 180.506C375.489 180.087 373.948 179.74 372.268 179.32C371.893 179.227 371.665 178.846 371.759 178.471Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.015 177.841C374.296 178.107 374.308 178.55 374.042 178.83C372.759 180.182 371.473 181.536 370.173 182.879C370.07 182.986 369.963 183.098 369.854 183.214C369.392 183.705 368.875 184.253 368.263 184.685C367.947 184.908 367.51 184.833 367.287 184.517C367.064 184.201 367.139 183.764 367.455 183.541C367.942 183.198 368.338 182.779 368.79 182.3C368.911 182.173 369.036 182.041 369.168 181.905C370.462 180.568 371.743 179.219 373.026 177.867C373.292 177.586 373.735 177.574 374.015 177.841Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M366.807 183.829C366.865 183.446 367.222 183.183 367.604 183.241C369.068 183.463 370.317 183.711 371.661 183.981C371.698 183.988 371.735 183.995 371.772 184.003C373.085 184.266 374.499 184.55 376.318 184.853C376.699 184.916 376.957 185.277 376.893 185.658C376.829 186.039 376.469 186.297 376.087 186.234C374.246 185.927 372.813 185.639 371.5 185.376C371.462 185.369 371.424 185.361 371.386 185.353C370.042 185.084 368.822 184.841 367.394 184.625C367.012 184.568 366.749 184.211 366.807 183.829Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M381.953 186.824C382.048 186.449 382.429 186.223 382.803 186.318C384.66 186.789 386.549 186.918 388.522 187.018C388.908 187.037 389.205 187.366 389.185 187.752C389.166 188.139 388.837 188.436 388.451 188.416C386.479 188.316 384.465 188.184 382.459 187.675C382.084 187.58 381.858 187.199 381.953 186.824Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M373.932 184.268C374.245 184.04 374.683 184.109 374.91 184.422C375.927 185.818 376.863 187.286 377.785 188.734C378.208 189.398 378.629 190.058 379.053 190.705C379.166 190.878 379.261 191.03 379.352 191.178C379.473 191.373 379.587 191.558 379.733 191.77C379.966 192.107 380.193 192.376 380.439 192.561C380.748 192.792 380.811 193.231 380.579 193.541C380.347 193.85 379.908 193.912 379.599 193.681C379.175 193.363 378.847 192.95 378.581 192.565C378.431 192.348 378.267 192.085 378.122 191.852C378.033 191.708 377.95 191.576 377.883 191.473C377.436 190.792 377.004 190.114 376.575 189.44C375.665 188.013 374.77 186.607 373.779 185.246C373.551 184.933 373.62 184.496 373.932 184.268Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M367.224 183.492C367.517 183.24 367.959 183.274 368.211 183.568C369.864 185.497 371.533 187.568 373.017 189.41C373.481 189.986 373.926 190.539 374.348 191.058C374.591 191.358 374.545 191.799 374.245 192.043C373.945 192.286 373.504 192.241 373.261 191.94C372.833 191.414 372.383 190.855 371.917 190.276C370.435 188.437 368.786 186.39 367.148 184.479C366.896 184.185 366.93 183.743 367.224 183.492Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M371.663 190.946C371.671 190.559 371.99 190.252 372.377 190.259C373.697 190.285 374.97 190.619 376.157 190.947C376.24 190.969 376.322 190.992 376.403 191.015C377.524 191.325 378.569 191.614 379.627 191.703C380.013 191.735 380.299 192.073 380.267 192.458C380.235 192.844 379.896 193.13 379.511 193.098C378.316 192.998 377.148 192.674 376.054 192.371C375.964 192.346 375.874 192.321 375.785 192.296C374.587 191.966 373.472 191.68 372.35 191.659C371.963 191.651 371.656 191.332 371.663 190.946Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M382.237 173.806C382.457 173.488 382.893 173.409 383.211 173.63C383.692 173.964 384.15 174.281 384.589 174.584C387.092 176.315 388.961 177.607 390.826 179.162C391.123 179.409 391.163 179.851 390.916 180.148C390.668 180.445 390.227 180.485 389.93 180.237C388.116 178.726 386.306 177.474 383.801 175.741C383.361 175.437 382.899 175.118 382.412 174.78C382.095 174.559 382.016 174.123 382.237 173.806Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M384.69 165.313C385.074 165.356 385.351 165.702 385.308 166.086C385.167 167.354 385.024 168.868 384.881 170.391C384.662 172.701 384.442 175.032 384.225 176.556C384.17 176.939 383.815 177.205 383.433 177.15C383.05 177.095 382.784 176.741 382.839 176.358C383.053 174.856 383.266 172.603 383.48 170.33C383.624 168.798 383.769 167.257 383.917 165.931C383.959 165.547 384.306 165.27 384.69 165.313Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M391.651 161.976C391.888 162.281 391.834 162.721 391.528 162.958C390.889 163.456 389.552 164.406 388.149 165.403C387.943 165.549 387.735 165.696 387.529 165.843C385.89 167.008 384.294 168.152 383.618 168.71C383.32 168.956 382.878 168.914 382.632 168.616C382.386 168.318 382.428 167.877 382.727 167.631C383.452 167.031 385.102 165.851 386.717 164.702C386.925 164.555 387.132 164.408 387.337 164.262C388.749 163.259 390.055 162.33 390.669 161.853C390.974 161.616 391.414 161.671 391.651 161.976Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M388.164 161.853C388.369 161.526 388.801 161.427 389.129 161.633C390.728 162.637 392.453 163.431 394.212 164.239C394.934 164.572 395.661 164.906 396.388 165.259C396.588 165.356 396.802 165.447 397.04 165.549C397.165 165.602 397.298 165.659 397.438 165.72C397.819 165.887 398.239 166.085 398.602 166.327C398.924 166.542 399.011 166.976 398.797 167.298C398.582 167.619 398.148 167.706 397.826 167.492C397.57 167.321 397.245 167.164 396.875 167.002C396.767 166.955 396.651 166.905 396.533 166.855C396.276 166.745 396.007 166.63 395.777 166.518C395.108 166.194 394.415 165.875 393.712 165.552C391.921 164.728 390.065 163.874 388.384 162.819C388.057 162.613 387.958 162.181 388.164 161.853Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M396.387 174.305C396.581 174.639 396.467 175.068 396.133 175.262C395.782 175.466 395.056 175.905 394.173 176.44C392.112 177.687 389.193 179.454 388.168 179.966C387.822 180.139 387.402 179.999 387.229 179.653C387.056 179.308 387.196 178.887 387.542 178.714C388.516 178.227 391.271 176.559 393.314 175.322C394.246 174.758 395.03 174.283 395.43 174.051C395.764 173.857 396.192 173.971 396.387 174.305Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M396.654 164.967C397.032 165.051 397.27 165.425 397.186 165.802C396.83 167.402 396.563 169.005 396.292 170.629L396.291 170.638C396.022 172.254 395.749 173.891 395.384 175.53C395.301 175.908 394.927 176.146 394.549 176.062C394.172 175.978 393.934 175.604 394.018 175.226C394.373 173.626 394.641 172.024 394.911 170.399L394.913 170.39C395.182 168.775 395.455 167.138 395.819 165.499C395.903 165.121 396.277 164.883 396.654 164.967Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M391.873 164.784C392.251 164.864 392.493 165.235 392.414 165.613C392.355 165.89 392.297 166.168 392.239 166.446C392.023 167.477 391.806 168.515 391.571 169.548C391.476 169.962 391.381 170.372 391.286 170.78C391.106 171.552 390.928 172.317 390.762 173.09L390.735 173.211C390.729 173.242 390.725 173.261 390.723 173.275C390.719 173.294 390.717 173.31 390.717 173.35C390.717 173.737 390.404 174.05 390.017 174.05C389.631 174.05 389.317 173.737 389.317 173.35C389.317 173.137 389.348 172.998 389.38 172.856C389.384 172.836 389.389 172.815 389.393 172.795C389.562 172.012 389.745 171.226 389.926 170.446C390.02 170.041 390.114 169.637 390.206 169.236C390.438 168.217 390.652 167.195 390.867 166.165C390.926 165.886 390.985 165.605 391.044 165.325C391.124 164.946 391.495 164.704 391.873 164.784Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M391.035 173.099C391.222 173.437 391.101 173.863 390.763 174.051C390.081 174.43 389.357 174.757 388.668 175.069C388.455 175.165 388.244 175.26 388.04 175.355C387.83 175.452 387.616 175.553 387.4 175.655C386.699 175.986 385.967 176.332 385.222 176.615C384.861 176.753 384.457 176.571 384.319 176.21C384.182 175.848 384.363 175.444 384.725 175.307C385.414 175.044 386.077 174.731 386.766 174.406C386.991 174.3 387.219 174.192 387.452 174.085C387.681 173.979 387.906 173.877 388.129 173.776C388.806 173.469 389.456 173.175 390.083 172.827C390.421 172.639 390.847 172.761 391.035 173.099Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.95 164.255C388.123 163.909 388.544 163.769 388.889 163.942L388.892 163.943C390.324 164.659 391.025 165.01 392.8 165.719C393.158 165.863 393.333 166.27 393.19 166.629C393.046 166.988 392.639 167.163 392.28 167.019C390.452 166.288 389.712 165.918 388.263 165.194C387.918 165.021 387.777 164.601 387.95 164.255Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M398.641 165.945C398.676 166.33 398.392 166.671 398.007 166.706C396.1 166.88 393.283 167.024 391.098 167.024C390.711 167.024 390.398 166.71 390.398 166.324C390.398 165.937 390.711 165.624 391.098 165.624C393.237 165.624 396.011 165.482 397.88 165.312C398.265 165.276 398.605 165.56 398.641 165.945Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M388.526 172.961C388.615 172.585 388.993 172.353 389.369 172.442C389.779 172.54 390.187 172.639 390.594 172.737C391.552 172.969 392.502 173.198 393.461 173.411C393.631 173.448 393.799 173.486 393.965 173.524C394.859 173.725 395.707 173.916 396.572 174.003C396.957 174.041 397.237 174.385 397.199 174.769C397.16 175.154 396.817 175.435 396.433 175.396C395.475 175.3 394.531 175.087 393.638 174.885C393.477 174.849 393.317 174.812 393.158 174.777C392.186 174.562 391.214 174.327 390.251 174.094C389.847 173.997 389.445 173.9 389.044 173.804C388.668 173.715 388.436 173.337 388.526 172.961Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M396.287 170.839C396.206 171.217 395.834 171.457 395.456 171.376C393.791 171.018 392.137 170.659 390.483 170.294C390.106 170.211 389.867 169.837 389.95 169.46C390.034 169.082 390.407 168.844 390.785 168.927C392.435 169.292 394.087 169.65 395.75 170.007C396.128 170.089 396.369 170.461 396.287 170.839ZM393.842 163.858C393.989 164.216 393.819 164.625 393.462 164.772C392.266 165.265 391.247 165.66 390.48 165.944C390.118 166.078 389.715 165.894 389.58 165.531C389.446 165.169 389.631 164.766 389.993 164.631C390.744 164.353 391.748 163.965 392.928 163.478C393.285 163.331 393.695 163.501 393.842 163.858Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M392.285 177.34C392.125 177.692 391.71 177.847 391.358 177.687L386.58 175.515C386.228 175.355 386.072 174.94 386.232 174.588C386.392 174.236 386.807 174.081 387.159 174.241L391.937 176.413C392.289 176.573 392.445 176.988 392.285 177.34Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M387.106 190.892C387.044 191.273 386.684 191.532 386.302 191.47L381.11 190.628C380.728 190.566 380.469 190.206 380.531 189.825C380.593 189.443 380.952 189.184 381.334 189.246L386.527 190.088C386.908 190.15 387.167 190.51 387.106 190.892ZM376.897 188.771C376.847 189.155 376.497 189.426 376.113 189.376L370.709 188.684C370.325 188.635 370.054 188.284 370.104 187.9C370.153 187.517 370.503 187.246 370.887 187.295L376.291 187.988C376.675 188.037 376.946 188.388 376.897 188.771Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M400.957 151.545C400.859 151.92 400.477 152.144 400.103 152.046C399.016 151.763 398.115 151.478 397.279 151.207C397.174 151.174 397.071 151.14 396.968 151.107C396.248 150.873 395.573 150.654 394.84 150.451C394.467 150.348 394.249 149.963 394.352 149.59C394.455 149.218 394.84 148.999 395.213 149.102C395.977 149.313 396.684 149.543 397.402 149.776C397.504 149.809 397.607 149.842 397.71 149.875C398.539 150.143 399.409 150.418 400.456 150.691C400.83 150.789 401.055 151.171 400.957 151.545Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M377.515 182.548C377.436 182.927 377.065 183.17 376.687 183.091C375.637 182.871 374.712 182.661 373.807 182.455C373.743 182.44 373.679 182.425 373.614 182.411C372.775 182.219 371.947 182.029 371.037 181.836C370.659 181.755 370.417 181.383 370.498 181.005C370.578 180.627 370.95 180.386 371.328 180.466C372.249 180.662 373.087 180.854 373.925 181.045C373.99 181.06 374.054 181.075 374.119 181.09C375.023 181.296 375.937 181.504 376.973 181.72C377.351 181.799 377.594 182.17 377.515 182.548ZM378.812 175.689C378.73 176.067 378.358 176.307 377.98 176.225L373.296 175.213C372.918 175.131 372.678 174.758 372.76 174.38C372.841 174.003 373.214 173.762 373.592 173.844L378.276 174.857C378.653 174.939 378.894 175.311 378.812 175.689Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M376.024 166.987C375.945 167.366 375.574 167.608 375.195 167.529L368.617 166.15C368.239 166.071 367.996 165.7 368.076 165.321C368.155 164.943 368.526 164.701 368.904 164.78L375.482 166.159C375.861 166.238 376.103 166.609 376.024 166.987ZM376.644 163.036C376.561 163.414 376.187 163.653 375.81 163.57L370.406 162.384C370.028 162.301 369.789 161.928 369.872 161.55C369.955 161.173 370.328 160.934 370.706 161.017L376.11 162.203C376.488 162.285 376.727 162.659 376.644 163.036Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M386.976 153.375C386.897 153.753 386.527 153.997 386.148 153.918L378.57 152.346C378.191 152.267 377.948 151.897 378.027 151.518C378.105 151.14 378.476 150.897 378.854 150.975L386.432 152.547C386.811 152.626 387.054 152.996 386.976 153.375ZM383.132 159.436C382.997 159.798 382.593 159.981 382.231 159.845L377.212 157.963C376.85 157.827 376.666 157.424 376.802 157.062C376.938 156.7 377.341 156.516 377.703 156.652L382.723 158.534C383.085 158.67 383.268 159.074 383.132 159.436Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M391.306 147.757C391.199 148.127 390.812 148.341 390.442 148.235C389.282 147.904 388.392 147.64 387.666 147.418L383.043 146.058C382.677 145.95 382.465 145.57 382.565 145.202C382.665 144.835 383.04 144.615 383.41 144.707C384.723 145.035 385.539 145.29 386.666 145.642C387.096 145.777 387.572 145.925 388.137 146.098L390.831 146.891C391.201 146.999 391.413 147.387 391.306 147.757Z" fill="black"/>
+<path d="M222.152 132.778V49.2941L273.046 26.9722L345.37 41.2582V121.617L298.493 147.511L280.636 144.385L279.992 118.966L241.238 137.027L222.152 132.778Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M240.171 83.7367C240.558 83.7367 240.871 84.0501 240.871 84.4367C240.87 99.4528 240.871 108.188 240.871 117.32C240.872 123.423 240.872 129.704 240.872 138.154C240.872 138.541 240.559 138.854 240.172 138.854C239.786 138.854 239.472 138.541 239.472 138.154C239.472 129.704 239.472 123.424 239.471 117.321C239.471 108.188 239.47 99.4527 239.471 84.4366C239.471 84.05 239.785 83.7367 240.171 83.7367Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M280.227 94.2268C280.613 94.2268 280.927 94.5403 280.927 94.9269C280.925 109.788 280.926 117.225 280.927 125.22C280.927 130.702 280.928 136.447 280.928 145.029C280.928 145.415 280.614 145.729 280.228 145.729C279.841 145.729 279.528 145.415 279.528 145.029C279.528 136.448 279.527 130.703 279.527 125.22C279.526 117.225 279.525 109.788 279.527 94.9268C279.527 94.5402 279.84 94.2268 280.227 94.2268Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M222.424 47.3726C222.81 47.3726 223.124 47.686 223.124 48.0726C223.122 65.3479 223.123 88.8932 223.123 108.764C223.123 117.708 223.124 125.907 223.123 132.455C223.123 132.841 222.81 133.155 222.423 133.155C222.037 133.155 221.723 132.841 221.723 132.455C221.724 125.907 221.723 117.707 221.723 108.762C221.723 88.8922 221.722 65.3474 221.724 48.0725C221.724 47.6859 222.037 47.3725 222.424 47.3726Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.3 50.3572C299.687 50.3572 300 50.6706 300 51.0572C299.999 71.0314 300 98.2551 300 121.23C300.001 131.572 300.001 141.053 300.001 148.624C300.001 149.011 299.688 149.324 299.301 149.324C298.914 149.324 298.601 149.011 298.601 148.624C298.601 141.053 298.601 131.572 298.6 121.23C298.6 98.2552 298.599 71.0314 298.6 51.0571C298.6 50.6705 298.914 50.3571 299.3 50.3572Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M345.076 35.0979C345.463 35.0979 345.776 35.4113 345.776 35.7979C345.775 55.6549 345.775 77.3446 345.776 96.8806C345.776 105.842 345.776 114.349 345.776 122.019C345.776 122.406 345.463 122.719 345.076 122.719C344.69 122.72 344.376 122.406 344.376 122.02C344.376 114.349 344.376 105.842 344.376 96.8807C344.375 77.3446 344.375 55.6549 344.376 35.7978C344.376 35.4112 344.69 35.0979 345.076 35.0979Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M276.38 25.2096C276.517 25.571 276.335 25.9752 275.973 26.1124C262.439 31.247 230.803 44.8165 217.865 50.3655C217.309 50.6039 216.788 50.8276 216.304 51.0351C215.949 51.1874 215.537 51.0229 215.385 50.6676C215.233 50.3123 215.397 49.9007 215.752 49.7484C216.239 49.5396 216.764 49.3145 217.324 49.0743C230.256 43.5275 261.912 29.9494 275.477 24.8034C275.838 24.6663 276.242 24.8481 276.38 25.2096Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M353.339 36.4537C353.504 36.8034 353.354 37.2205 353.004 37.3853C330.018 48.2158 317.506 54.101 291.966 66.0148C291.615 66.1783 291.199 66.0267 291.035 65.6764C290.872 65.326 291.023 64.9095 291.374 64.7461C316.912 52.8333 329.423 46.9489 352.408 36.1188C352.757 35.954 353.175 36.104 353.339 36.4537Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M349.034 119.397C349.214 119.739 349.083 120.162 348.741 120.343C337.586 126.224 328.399 131.34 320.345 135.824C309.509 141.857 300.725 146.747 291.965 150.824C291.614 150.987 291.198 150.835 291.035 150.484C290.872 150.134 291.024 149.717 291.374 149.554C300.104 145.493 308.81 140.644 319.593 134.639C327.643 130.157 336.85 125.03 348.088 119.104C348.43 118.924 348.853 119.055 349.034 119.397Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M266.135 24.7727C266.206 24.3926 266.571 24.1418 266.951 24.2125C277.024 26.0851 297.454 30.0604 317.627 33.9857C329.351 36.2669 340.987 38.5312 350.454 40.356C350.833 40.4292 351.082 40.7962 351.009 41.1759C350.935 41.5555 350.568 41.8039 350.189 41.7307C340.715 39.9044 329.073 37.6392 317.347 35.3575C297.18 31.4333 276.762 27.4606 266.695 25.5889C266.315 25.5182 266.064 25.1528 266.135 24.7727ZM214.211 46.5961C214.282 46.216 214.647 45.965 215.027 46.0354C218.6 46.6977 223.569 47.6439 229.461 48.7659C250.827 52.8348 284.341 59.2168 307.511 62.7632C307.893 62.8217 308.155 63.1789 308.097 63.5611C308.038 63.9432 307.681 64.2056 307.299 64.1471C284.1 60.5962 250.541 54.2054 229.177 50.1371C223.293 49.0166 218.335 48.0723 214.772 47.412C214.392 47.3415 214.141 46.9763 214.211 46.5961ZM237.571 90.5238C237.633 90.1421 237.992 89.8828 238.374 89.9444C249.62 91.762 257.784 93.2586 266.42 94.8421C272.608 95.9765 279.038 97.1555 287.019 98.5289C287.4 98.5944 287.656 98.9564 287.59 99.3374C287.525 99.7184 287.163 99.9741 286.782 99.9086C278.764 98.5289 272.328 97.3487 266.143 96.2146C257.525 94.6344 249.394 93.1435 238.15 91.3265C237.769 91.2648 237.509 90.9054 237.571 90.5238Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M221.747 132.271C221.849 131.898 222.233 131.677 222.606 131.779C228.186 133.293 233.693 134.616 239.26 135.777C239.639 135.856 239.881 136.227 239.802 136.606C239.723 136.984 239.353 137.227 238.974 137.148C233.379 135.98 227.846 134.651 222.24 133.13C221.866 133.028 221.646 132.644 221.747 132.271Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M275.735 142.429C275.836 142.056 276.221 141.835 276.594 141.937C285.504 144.355 298.704 146.947 307.815 148.515C308.196 148.58 308.452 148.942 308.386 149.323C308.321 149.704 307.959 149.96 307.578 149.894C298.453 148.324 285.202 145.723 276.227 143.288C275.854 143.186 275.634 142.802 275.735 142.429Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M317.473 53.08C317.847 53.1764 318.073 53.5581 317.976 53.9325L300.512 121.702C300.415 122.076 300.034 122.301 299.659 122.205C299.285 122.108 299.06 121.727 299.156 121.352L316.62 53.5831C316.717 53.2088 317.099 52.9835 317.473 53.08ZM311.514 55.7586C311.888 55.8551 312.113 56.2368 312.017 56.6111L300.512 101.255C300.415 101.629 300.034 101.855 299.659 101.758C299.285 101.662 299.06 101.28 299.156 100.906L310.661 56.2618C310.758 55.8874 311.139 55.6621 311.514 55.7586ZM306.257 58.2648C306.632 58.3612 306.857 58.7429 306.76 59.1173L299.583 86.969C299.486 87.3433 299.105 87.5686 298.73 87.4721C298.356 87.3757 298.131 86.994 298.227 86.6196L305.405 58.7679C305.501 58.3936 305.883 58.1683 306.257 58.2648Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M334.77 45.0441C335.145 45.1405 335.37 45.5222 335.274 45.8966L310.653 141.435C310.557 141.809 310.175 142.034 309.801 141.938C309.426 141.841 309.201 141.46 309.297 141.085L333.918 45.5472C334.014 45.1729 334.396 44.9476 334.77 45.0441ZM328.926 47.2763C329.3 47.3727 329.526 47.7544 329.429 48.1288L304.464 145.006C304.367 145.38 303.985 145.606 303.611 145.509C303.237 145.413 303.011 145.031 303.108 144.657L328.073 47.7794C328.17 47.4051 328.552 47.1798 328.926 47.2763ZM323.625 49.9549C324 50.0514 324.225 50.4331 324.128 50.8074L300.065 144.183C299.969 144.557 299.587 144.783 299.213 144.686C298.838 144.59 298.613 144.208 298.71 143.834L322.773 50.4581C322.869 50.0837 323.251 49.8584 323.625 49.9549Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M345.469 42.3656C345.843 42.4621 346.069 42.8438 345.972 43.2181L322.502 134.292C322.406 134.666 322.024 134.891 321.65 134.795C321.275 134.698 321.05 134.317 321.147 133.942L344.616 42.8688C344.713 42.4944 345.095 42.2691 345.469 42.3656ZM340.859 42.3656C341.233 42.4621 341.458 42.8438 341.362 43.2181L317.202 136.97C317.105 137.345 316.723 137.57 316.349 137.473C315.975 137.377 315.749 136.995 315.846 136.621L340.006 42.8688C340.102 42.4944 340.484 42.2691 340.859 42.3656ZM346.481 58.8838C346.856 58.9803 347.081 59.362 346.985 59.7364L328.577 131.167C328.48 131.541 328.099 131.766 327.724 131.67C327.35 131.573 327.125 131.192 327.221 130.817L345.629 59.387C345.725 59.0126 346.107 58.7874 346.481 58.8838Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M345.172 84.5304C345.546 84.6269 345.772 85.0086 345.675 85.3829L334.797 127.594C334.701 127.969 334.319 128.194 333.945 128.098C333.57 128.001 333.345 127.619 333.441 127.245L344.319 85.0336C344.416 84.6592 344.798 84.4339 345.172 84.5304ZM345.172 103.974C345.546 104.07 345.772 104.452 345.675 104.826L340.613 124.469C340.517 124.844 340.135 125.069 339.761 124.973C339.386 124.876 339.161 124.494 339.257 124.12L344.319 104.477C344.416 104.102 344.798 103.877 345.172 103.974Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M257.16 93.4945C257.324 93.8447 257.173 94.2613 256.823 94.425L240.269 102.161C239.919 102.325 239.502 102.174 239.338 101.824C239.175 101.473 239.326 101.057 239.676 100.893L256.23 93.1567C256.58 92.993 256.997 93.1442 257.16 93.4945ZM248.616 91.8556C248.78 92.2058 248.628 92.6225 248.278 92.7861L240.269 96.5292C239.919 96.6929 239.502 96.5416 239.338 96.1914C239.175 95.8412 239.326 95.4246 239.676 95.2609L247.685 91.5178C248.036 91.3541 248.452 91.5054 248.616 91.8556Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M280.822 97.856C280.986 98.2062 280.835 98.6228 280.485 98.7865L240.752 117.356C240.401 117.52 239.985 117.368 239.821 117.018C239.657 116.668 239.809 116.251 240.159 116.088L279.892 97.5182C280.242 97.3545 280.659 97.5057 280.822 97.856ZM271.447 96.6053C271.611 96.9556 271.46 97.3722 271.109 97.5359L240.752 111.724C240.401 111.887 239.985 111.736 239.821 111.386C239.657 111.036 239.809 110.619 240.159 110.455L270.517 96.2675C270.867 96.1039 271.283 96.2551 271.447 96.6053ZM264.38 94.9799C264.544 95.3301 264.393 95.7467 264.043 95.9104L240.752 106.796C240.401 106.959 239.985 106.808 239.821 106.458C239.657 106.108 239.809 105.691 240.159 105.527L263.45 94.6421C263.8 94.4784 264.217 94.6296 264.38 94.9799Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M281.209 102.693C281.372 103.043 281.221 103.46 280.871 103.624L240.751 122.374C240.401 122.537 239.985 122.386 239.821 122.036C239.657 121.686 239.809 121.269 240.159 121.105L280.278 102.355C280.628 102.192 281.045 102.343 281.209 102.693ZM281.209 107.621C281.372 107.972 281.221 108.388 280.871 108.552L240.752 127.302C240.401 127.466 239.985 127.314 239.821 126.964C239.657 126.614 239.809 126.197 240.159 126.034L280.278 107.284C280.628 107.12 281.045 107.271 281.209 107.621ZM280.376 113.643C280.54 113.993 280.388 114.41 280.038 114.573L240.752 132.934C240.401 133.098 239.985 132.946 239.821 132.596C239.657 132.246 239.809 131.829 240.159 131.666L279.445 113.305C279.796 113.141 280.212 113.293 280.376 113.643ZM280.376 118.67C280.54 119.02 280.388 119.437 280.038 119.6L240.752 137.961C240.401 138.125 239.985 137.974 239.821 137.623C239.657 137.273 239.809 136.857 240.159 136.693L279.445 118.332C279.796 118.168 280.212 118.32 280.376 118.67Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_4153_404911" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(295.252 127.045) rotate(90.9937) scale(42.0702 90.2602)">
+<stop/>
+<stop offset="1" stop-color="#3E7BFA" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint1_radial_4153_404911" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(177.652 211.044) rotate(90.9937) scale(42.0702 90.2602)">
+<stop/>
+<stop offset="1" stop-color="#3E7BFA" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint2_radial_4153_404911" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(390.452 202.645) rotate(90.9937) scale(42.0702 90.2602)">
+<stop/>
+<stop offset="1" stop-color="#3E7BFA" stop-opacity="0"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/web/src/layouts/NavEntry.tsx b/web/src/layouts/NavEntry.tsx
deleted file mode 100644
index 8f6642405..000000000
--- a/web/src/layouts/NavEntry.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react'
-import { Color, Icon, IconName, Layout, Text } from '@harness/uicore'
-import cx from 'classnames'
-import { Link, useRouteMatch, matchPath } from 'react-router-dom'
-import css from './layout.module.scss'
-
-interface NavEntryProps {
-  href: string
-  icon: IconName
-  text?: string
-  external?: boolean
-  className?: string
-  height?: string
-  iconSize?: number
-  isSelected?: boolean
-  iconColor?: Color
-}
-
-export const NavEntry: React.FC<NavEntryProps> = ({
-  href,
-  icon,
-  text,
-  external,
-  className,
-  height,
-  iconSize = 30,
-  isSelected,
-  iconColor = Color.WHITE
-}) => {
-  const routeMatch = useRouteMatch()
-  const match = isSelected || matchPath(href, routeMatch)?.isExact
-  const linkProps = external ? { to: href, target: '_blank' } : { to: href }
-
-  return (
-    <li
-      className={cx({ [css.active]: !!match }, className)}
-      style={{ '--nav-custom-item-height': height } as React.CSSProperties}>
-      <Link {...linkProps}>
-        <Layout.Vertical spacing="xsmall">
-          <Icon name={icon} size={iconSize} color={iconColor} className={css.icon} />
-          {text && <Text className={css.text}>{text}</Text>}
-        </Layout.Vertical>
-      </Link>
-    </li>
-  )
-}
diff --git a/web/src/layouts/layout.module.scss b/web/src/layouts/layout.module.scss
index 41f91b9ff..697222d4b 100644
--- a/web/src/layouts/layout.module.scss
+++ b/web/src/layouts/layout.module.scss
@@ -4,91 +4,31 @@
   .layout {
     height: 100%;
 
-    .nav {
-      width: var(--nav-item-width);
-      background-color: var(--primary-9);
-      height: 100%;
-
-      ol {
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-
-        &,
-        li {
-          margin: 0;
-          padding: 0;
-        }
-
-        li {
-          list-style: none;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: var(--nav-item-width);
-          height: var(--nav-custom-item-height, var(--nav-item-height));
-
-          &:not(:first-of-type) {
-            opacity: 0.65;
-
-            &.active,
-            &:hover {
-              a {
-                background-color: var(--theme-light-nav-panel-bg);
-              }
-            }
-
-            &.active {
-              opacity: 1;
-            }
-          }
-
-          &.spacer {
-            flex-grow: 1;
-            pointer-events: none;
-          }
-
-          a {
-            display: inline-flex;
-            width: 100%;
-            height: 100%;
-            align-items: center;
-            justify-content: center;
-          }
-
-          .icon {
-            display: inline-flex;
-            justify-content: center;
-
-            svg[fill='none'] {
-              circle,
-              path {
-                fill: currentColor;
-              }
-            }
-          }
-
-          .text {
-            color: var(--white);
-            text-align: center;
-            font-size: 9px;
-            font-weight: 500;
-            line-height: 14px;
-            text-transform: uppercase;
-          }
-        }
-      }
-    }
-
     .menu {
       width: var(--nav-menu-width);
       min-width: var(--nav-menu-width);
-      background-color: var(--theme-light-nav-panel-bg);
+      background-color: var(--nav-background);
       height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .settings {
+        margin: 0 var(--spacing-medium);
+        padding: var(--spacing-small) 0;
+        border-top: 1px solid var(--grey-200);
+        border-bottom: 1px solid var(--grey-200);
+      }
+
+      .profile {
+        margin: 0 var(--spacing-medium);
+        padding: var(--spacing-medium) 0;
+      }
     }
   }
 
   .content {
     flex-grow: 1;
+    background-color: var(--page-background);
+    overflow: auto;
   }
 }
diff --git a/web/src/layouts/layout.module.scss.d.ts b/web/src/layouts/layout.module.scss.d.ts
index b437f2e9e..bcc0aec7d 100644
--- a/web/src/layouts/layout.module.scss.d.ts
+++ b/web/src/layouts/layout.module.scss.d.ts
@@ -3,12 +3,9 @@
 declare const styles: {
   readonly main: string
   readonly layout: string
-  readonly nav: string
-  readonly active: string
-  readonly spacer: string
-  readonly icon: string
-  readonly text: string
   readonly menu: string
+  readonly settings: string
+  readonly profile: string
   readonly content: string
 }
 export default styles
diff --git a/web/src/layouts/layout.tsx b/web/src/layouts/layout.tsx
index 3d3195d01..7864920fd 100644
--- a/web/src/layouts/layout.tsx
+++ b/web/src/layouts/layout.tsx
@@ -1,56 +1,54 @@
-import React, { useMemo } from 'react'
-import { Container, Icon, Layout } from '@harness/uicore'
+import React from 'react'
+import { Avatar, Container, FlexExpander, Layout } from '@harness/uicore'
 import { Render } from 'react-jsx-match'
-import { Link, useRouteMatch } from 'react-router-dom'
-import { useStrings } from 'framework/strings'
 import { routes } from 'RouteDefinitions'
 import { useAppContext } from 'AppContext'
-import { NavEntry } from './NavEntry'
+import { useStrings } from 'framework/strings'
+import { useDocumentTitle } from 'hooks/useDocumentTitle'
+import { NavMenuItem } from './menu/NavMenuItem'
+import { GitnessLogo } from '../components/GitnessLogo/GitnessLogo'
+import { DefaultMenu } from './menu/DefaultMenu'
 import css from './layout.module.scss'
 
-interface AppLayoutProps {
-  type?: 'with-nav' | 'with-menu'
+interface LayoutWithSideNavProps {
+  title: string
   menu?: React.ReactNode
 }
 
-const AppLayout: React.FC<AppLayoutProps> = ({ type, children, menu }) => {
-  const { getString } = useStrings()
-  const routeMatch = useRouteMatch()
-  const isSpace = useMemo(
-    () => routeMatch.path.startsWith('/:space') || routeMatch.path.endsWith('/:space'),
-    [routeMatch]
-  )
-
+export const LayoutWithSideNav: React.FC<LayoutWithSideNavProps> = ({ title, children, menu = <DefaultMenu /> }) => {
   const { currentUser } = useAppContext()
+  const { getString } = useStrings()
 
-  if (!type) {
-    return <>{children}</>
-  }
+  useDocumentTitle(title)
 
   return (
     <Container className={css.main}>
       <Layout.Horizontal className={css.layout}>
-        <nav className={css.nav}>
-          <ol>
-            {<NavCodeLogo />}
+        <Container className={css.menu}>
+          <Layout.Vertical spacing="small">
+            <GitnessLogo />
+            <Container>{menu}</Container>
+          </Layout.Vertical>
 
-            <NavEntry href={routes.toCODESpaces()} icon="grid" text={getString('spaces')} isSelected={isSpace} />
+          <FlexExpander />
 
-            {currentUser?.admin ? (
-              <NavEntry href={routes.toCODEUsers()} icon="user-groups" text={getString('admin')} />
-            ) : null}
+          <Render when={currentUser?.admin}>
+            <Container className={css.settings}>
+              <NavMenuItem icon="user-groups" label={getString('userManagement.text')} to={routes.toCODEUsers()} />
+            </Container>
+          </Render>
 
-            <li className={css.spacer}></li>
-
-            <NavEntry href="//docs.harness.io" external icon="nav-help" text={getString('help')} />
-
-            <NavEntry href={routes.toCODEUserProfile()} icon="code-settings" height="56px" />
-          </ol>
-        </nav>
-
-        <Render when={type === 'with-menu'}>
-          <Container className={css.menu}>{menu}</Container>
-        </Render>
+          <Render when={currentUser?.uid}>
+            <Container className={css.profile}>
+              <NavMenuItem
+                label={currentUser?.display_name || currentUser?.email}
+                to={routes.toCODEUserProfile()}
+                textProps={{ tag: 'span' }}>
+                <Avatar name={currentUser?.display_name || currentUser?.email} size="small" hoverCard={false} />
+              </NavMenuItem>
+            </Container>
+          </Render>
+        </Container>
 
         <Container className={css.content}>{children}</Container>
       </Layout.Horizontal>
@@ -58,18 +56,7 @@ const AppLayout: React.FC<AppLayoutProps> = ({ type, children, menu }) => {
   )
 }
 
-const NavCodeLogo: React.FC = () => (
-  <li>
-    <Link to="/">
-      <Icon name="code" size={34} />
-    </Link>
-  </li>
-)
-
-export const LayoutWithSideNav: React.FC = ({ children }) => <AppLayout type="with-nav">{children}</AppLayout>
-
-export const LayoutWithSideMenu: React.FC<Required<Pick<AppLayoutProps, 'menu'>>> = ({ children, menu }) => (
-  <AppLayout type="with-menu" menu={menu}>
-    {children}
-  </AppLayout>
-)
+export const LayoutWithoutSideNav: React.FC<{ title: string }> = ({ title, children }) => {
+  useDocumentTitle(title)
+  return <>{children}</>
+}
diff --git a/web/src/layouts/menu/AdminMenu.tsx b/web/src/layouts/menu/AdminMenu.tsx
deleted file mode 100644
index 28f52e3cd..000000000
--- a/web/src/layouts/menu/AdminMenu.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react'
-import { Container, Layout } from '@harness/uicore'
-
-import { useStrings } from 'framework/strings'
-import { routes } from 'RouteDefinitions'
-
-import { NavMenu } from './NavMenu'
-
-export const AdminMenu: React.FC = () => {
-  const { getString } = useStrings()
-
-  return (
-    <Container padding={{ top: 'medium' }}>
-      <Layout.Vertical spacing="small">
-        <NavMenu
-          textProps={{
-            iconProps: {
-              size: 12
-            }
-          }}
-          label={getString('userManagement.text')}
-          to={routes.toCODEUsers()}
-        />
-      </Layout.Vertical>
-    </Container>
-  )
-}
diff --git a/web/src/layouts/menu/DefaultMenu.module.scss b/web/src/layouts/menu/DefaultMenu.module.scss
new file mode 100644
index 000000000..9738b2528
--- /dev/null
+++ b/web/src/layouts/menu/DefaultMenu.module.scss
@@ -0,0 +1,103 @@
+.main {
+  padding: 0 var(--spacing-large) var(--spacing-large) !important;
+
+  .spaceSelector {
+    height: 53px;
+    border-radius: 4px;
+    padding: 5px 10px;
+    border: 1px solid var(--grey-100);
+    background: var(--white) !important;
+    margin-bottom: var(--spacing-medium) !important;
+
+    &.selected,
+    &:hover {
+      background: var(--primary-1) !important;
+      border-radius: 4px;
+      border: 1px solid var(--primary-3);
+      box-shadow: 0px 2px 4px 0px rgba(96, 97, 112, 0.16), 0px 0px 1px 0px rgba(40, 41, 61, 0.04);
+
+      .icon {
+        svg path {
+          fill: var(--primary-7);
+        }
+      }
+    }
+
+    .label {
+      flex-grow: 1;
+    }
+
+    .spaceLabel {
+      color: var(--gray-500);
+      font-size: 8px;
+      font-weight: 600;
+      line-height: 17px;
+    }
+
+    .spaceName {
+      color: var(--black);
+      font-size: 13px;
+      line-height: 20px;
+      padding-left: 17px;
+    }
+
+    .icon {
+      display: flex;
+      align-items: center;
+      padding-top: 3px;
+    }
+  }
+
+  .repoLinks {
+    border-left: 1px solid var(--grey-200);
+    margin-left: 17px;
+  }
+}
+
+.popoverPortal {
+  width: min(calc(100vw - var(--nav-menu-width)), 840px) !important;
+  height: 100vh;
+  position: fixed;
+  left: 5px;
+  top: -5px;
+
+  > div {
+    height: 100%;
+    width: 100%;
+  }
+}
+
+.popoverTarget {
+  display: block !important;
+}
+
+.popoverContent {
+  position: relative;
+  height: 100%;
+  width: min(calc(100vw - var(--nav-menu-width)), 840px) !important;
+  border-radius: 0;
+  box-shadow: none;
+  filter: drop-shadow(0px 2px 4px rgba(96, 97, 112, 0.16)) drop-shadow(0px 0px 1px rgba(40, 41, 61, 0.04));
+
+  &::before {
+    position: fixed;
+    content: '';
+    top: 0;
+    left: 233px;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(26, 26, 26, 0.4);
+  }
+
+  > div {
+    height: 100%;
+    width: 100%;
+    max-width: inherit !important;
+    border-radius: 0 !important;
+
+    &::before {
+      box-shadow: none !important;
+      filter: drop-shadow(0px 2px 4px rgba(96, 97, 112, 0.16)) drop-shadow(0px 0px 1px rgba(40, 41, 61, 0.04));
+    }
+  }
+}
diff --git a/web/src/layouts/menu/DefaultMenu.module.scss.d.ts b/web/src/layouts/menu/DefaultMenu.module.scss.d.ts
new file mode 100644
index 000000000..156fca2b5
--- /dev/null
+++ b/web/src/layouts/menu/DefaultMenu.module.scss.d.ts
@@ -0,0 +1,16 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly main: string
+  readonly spaceSelector: string
+  readonly selected: string
+  readonly icon: string
+  readonly label: string
+  readonly spaceLabel: string
+  readonly spaceName: string
+  readonly repoLinks: string
+  readonly popoverPortal: string
+  readonly popoverTarget: string
+  readonly popoverContent: string
+}
+export default styles
diff --git a/web/src/layouts/menu/DefaultMenu.tsx b/web/src/layouts/menu/DefaultMenu.tsx
new file mode 100644
index 000000000..4331d7198
--- /dev/null
+++ b/web/src/layouts/menu/DefaultMenu.tsx
@@ -0,0 +1,144 @@
+import React, { useMemo, useState } from 'react'
+import { Container, Layout } from '@harness/uicore'
+import { Render } from 'react-jsx-match'
+import { useHistory, useRouteMatch } from 'react-router-dom'
+import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
+import { useStrings } from 'framework/strings'
+import { routes } from 'RouteDefinitions'
+import type { TypesSpace } from 'services/code'
+import { SpaceSelector } from 'components/SpaceSelector/SpaceSelector'
+import { NavMenuItem } from './NavMenuItem'
+import css from './DefaultMenu.module.scss'
+
+export const DefaultMenu: React.FC = () => {
+  const history = useHistory()
+  const [selectedSpace, setSelectedSpace] = useState<TypesSpace | undefined>()
+  const { repoMetadata, gitRef, commitRef } = useGetRepositoryMetadata()
+  const { getString } = useStrings()
+  const repoPath = useMemo(() => repoMetadata?.path || '', [repoMetadata])
+  const routeMatch = useRouteMatch()
+  const isFilesSelected = useMemo(
+    () => routeMatch.path === '/:space*/:repoName' || routeMatch.path.startsWith('/:space*/:repoName/edit'),
+    [routeMatch]
+  )
+
+  return (
+    <Container className={css.main}>
+      <Layout.Vertical spacing="small">
+        <SpaceSelector
+          onSelect={(_selectedSpace, isUserAction) => {
+            setSelectedSpace(_selectedSpace)
+
+            if (isUserAction) {
+              history.push(routes.toCODERepositories({ space: _selectedSpace.path as string }))
+            }
+          }}
+        />
+
+        <Render when={selectedSpace}>
+          <NavMenuItem
+            icon="code-repo"
+            rightIcon={repoMetadata ? 'main-chevron-down' : 'main-chevron-right'}
+            textProps={{
+              rightIconProps: {
+                size: 10,
+                style: {
+                  flexGrow: 1,
+                  justifyContent: 'end',
+                  display: 'flex'
+                }
+              }
+            }}
+            label={getString('repositories')}
+            to={routes.toCODERepositories({ space: selectedSpace?.path as string })}
+            isDeselected={!!repoMetadata}
+            isHighlighted={!!repoMetadata}
+          />
+        </Render>
+
+        <Render when={repoMetadata}>
+          <Container className={css.repoLinks}>
+            <Layout.Vertical spacing="small">
+              <NavMenuItem
+                data-code-repo-section="files"
+                isSubLink
+                isSelected={isFilesSelected}
+                label={getString('files')}
+                to={routes.toCODERepository({ repoPath, gitRef: commitRef || gitRef })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="commits"
+                isSubLink
+                label={getString('commits')}
+                to={routes.toCODECommits({
+                  repoPath,
+                  commitRef: commitRef || gitRef
+                })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="branches"
+                isSubLink
+                label={getString('branches')}
+                to={routes.toCODEBranches({
+                  repoPath
+                })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="tags"
+                isSubLink
+                label={getString('tags')}
+                to={routes.toCODETags({
+                  repoPath
+                })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="pull-requests"
+                isSubLink
+                label={getString('pullRequests')}
+                to={routes.toCODEPullRequests({
+                  repoPath
+                })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="branches"
+                isSubLink
+                label={getString('webhooks')}
+                to={routes.toCODEWebhooks({
+                  repoPath
+                })}
+              />
+
+              <NavMenuItem
+                data-code-repo-section="settings"
+                isSubLink
+                label={getString('settings')}
+                to={routes.toCODESettings({
+                  repoPath
+                })}
+              />
+            </Layout.Vertical>
+          </Container>
+        </Render>
+
+        <Render when={selectedSpace}>
+          <NavMenuItem
+            icon="nav-project"
+            label={getString('accessControl')}
+            to={routes.toCODESpaceAccessControl({ space: selectedSpace?.path as string })}
+          />
+
+          <NavMenuItem
+            icon="code-settings"
+            label={getString('settings')}
+            to={routes.toCODESpaceSettings({ space: selectedSpace?.path as string })}
+          />
+        </Render>
+      </Layout.Vertical>
+    </Container>
+  )
+}
diff --git a/web/src/layouts/menu/GlobalSettingsMenu.tsx b/web/src/layouts/menu/GlobalSettingsMenu.tsx
deleted file mode 100644
index fe6d53b7b..000000000
--- a/web/src/layouts/menu/GlobalSettingsMenu.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Container, Layout } from '@harness/uicore'
-import React from 'react'
-
-import { useStrings } from 'framework/strings'
-import { routes } from 'RouteDefinitions'
-import { NavMenu } from './NavMenu'
-
-export const GlobalSettingsMenu: React.FC = () => {
-  const { getString } = useStrings()
-
-  return (
-    <Container padding={{ top: 'medium' }}>
-      <Layout.Vertical spacing="small">
-        <NavMenu
-          textProps={{
-            iconProps: {
-              size: 12
-            }
-          }}
-          label={getString('profile')}
-          to={routes.toCODEUserProfile()}
-        />
-      </Layout.Vertical>
-    </Container>
-  )
-}
diff --git a/web/src/layouts/menu/NavMenu.module.scss b/web/src/layouts/menu/NavMenu.module.scss
deleted file mode 100644
index de472f3fe..000000000
--- a/web/src/layouts/menu/NavMenu.module.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.link {
-  display: block;
-  margin-left: var(--spacing-medium);
-  padding: var(--spacing-small) var(--spacing-medium);
-  opacity: 0.8;
-  z-index: 1;
-
-  &[aria-disabled='true'] {
-    cursor: not-allowed !important;
-    opacity: 0.4;
-
-    &:active {
-      pointer-events: none !important;
-    }
-
-    &:hover {
-      background-color: transparent !important;
-    }
-  }
-
-  > p {
-    > span {
-      padding-right: var(--spacing-small) !important;
-    }
-  }
-
-  > p {
-    > span:not([data-icon='code-file-light']) {
-      color: var(--white) !important;
-
-      svg path {
-        fill: var(--white);
-      }
-    }
-  }
-
-  &.subLink {
-    padding-left: var(--spacing-medium);
-    margin-left: var(--spacing-xxlarge);
-  }
-
-  &:hover {
-    text-decoration: none;
-    opacity: 1;
-    border-top-left-radius: 2px;
-    border-bottom-left-radius: 2px;
-    background-color: rgba(2, 120, 213, 0.5);
-  }
-
-  &.selected {
-    background-color: rgba(2, 120, 213, 0.8);
-    border-top-left-radius: 2px;
-    border-bottom-left-radius: 2px;
-    opacity: 1;
-  }
-
-  .text {
-    color: var(--white) !important;
-    font-size: 13px !important;
-  }
-}
diff --git a/web/src/layouts/menu/NavMenuItem.module.scss b/web/src/layouts/menu/NavMenuItem.module.scss
new file mode 100644
index 000000000..d5401a2b8
--- /dev/null
+++ b/web/src/layouts/menu/NavMenuItem.module.scss
@@ -0,0 +1,83 @@
+.link {
+  padding: var(--spacing-small) var(--spacing-small);
+  opacity: 0.8;
+  z-index: 1;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  border-radius: 4px;
+
+  &[aria-disabled='true'] {
+    cursor: not-allowed !important;
+    opacity: 0.4;
+
+    &:active {
+      pointer-events: none !important;
+    }
+
+    &:hover {
+      background-color: transparent !important;
+    }
+  }
+
+  > p {
+    flex-grow: 1;
+
+    > span {
+      padding-right: var(--spacing-small) !important;
+    }
+  }
+
+  &.subLink {
+    margin-left: var(--spacing-small) !important;
+  }
+
+  &:hover {
+    text-decoration: none;
+    opacity: 1;
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+    background-color: #dbebff;
+  }
+
+  &.highlighted {
+    .text {
+      --text-color: var(--primary-8);
+      font-weight: 600;
+    }
+  }
+
+  &.selected {
+    .text {
+      --text-color: var(--primary-8);
+      font-weight: 600;
+    }
+
+    background-color: #dbebff;
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+    opacity: 1;
+  }
+
+  .text {
+    --text-color: var(--grey-700);
+
+    color: var(--text-color) !important;
+    font-size: 13px !important;
+
+    > span:not([data-icon='code-file']):not([data-icon='code-repo']) {
+      color: var(--text-color) !important;
+
+      svg path {
+        fill: var(--text-color);
+      }
+    }
+
+    > span[data-icon='code-file'],
+    > span[data-icon='code-repo'] {
+      svg path {
+        stroke: var(--text-color);
+      }
+    }
+  }
+}
diff --git a/web/src/layouts/menu/NavMenu.module.scss.d.ts b/web/src/layouts/menu/NavMenuItem.module.scss.d.ts
similarity index 86%
rename from web/src/layouts/menu/NavMenu.module.scss.d.ts
rename to web/src/layouts/menu/NavMenuItem.module.scss.d.ts
index 618411c41..97e4ad7ae 100644
--- a/web/src/layouts/menu/NavMenu.module.scss.d.ts
+++ b/web/src/layouts/menu/NavMenuItem.module.scss.d.ts
@@ -3,7 +3,8 @@
 declare const styles: {
   readonly link: string
   readonly subLink: string
-  readonly selected: string
+  readonly highlighted: string
   readonly text: string
+  readonly selected: string
 }
 export default styles
diff --git a/web/src/layouts/menu/NavMenu.tsx b/web/src/layouts/menu/NavMenuItem.tsx
similarity index 64%
rename from web/src/layouts/menu/NavMenu.tsx
rename to web/src/layouts/menu/NavMenuItem.tsx
index f4ac0ca84..571060b2a 100644
--- a/web/src/layouts/menu/NavMenu.tsx
+++ b/web/src/layouts/menu/NavMenuItem.tsx
@@ -2,9 +2,9 @@ import React from 'react'
 import cx from 'classnames'
 import { IconName, TextProps, Text } from '@harness/uicore'
 import { NavLink as Link, NavLinkProps } from 'react-router-dom'
-import css from './NavMenu.module.scss'
+import css from './NavMenuItem.module.scss'
 
-interface NavMenuProps extends NavLinkProps {
+interface NavMenuItemProps extends NavLinkProps {
   label: string
   icon?: IconName
   className?: string
@@ -13,9 +13,10 @@ interface NavMenuProps extends NavLinkProps {
   isSubLink?: boolean
   isSelected?: boolean
   isDeselected?: boolean
+  isHighlighted?: boolean
 }
 
-export const NavMenu: React.FC<NavMenuProps> = ({
+export const NavMenuItem: React.FC<NavMenuItemProps> = ({
   label,
   icon,
   rightIcon,
@@ -24,12 +25,19 @@ export const NavMenu: React.FC<NavMenuProps> = ({
   textProps,
   isSelected,
   isDeselected,
+  isHighlighted,
+  children,
   ...others
 }) => (
   <Link
-    className={cx(css.link, className, { [css.subLink]: isSubLink, [css.selected]: isSelected })}
+    className={cx(css.link, className, {
+      [css.subLink]: isSubLink,
+      [css.selected]: isSelected,
+      [css.highlighted]: isHighlighted
+    })}
     activeClassName={isDeselected ? '' : css.selected}
     {...others}>
+    {children}
     <Text icon={icon} rightIcon={rightIcon} className={css.text} {...textProps}>
       {label}
     </Text>
diff --git a/web/src/layouts/menu/RepositoryMenu.tsx b/web/src/layouts/menu/RepositoryMenu.tsx
deleted file mode 100644
index 308546d3c..000000000
--- a/web/src/layouts/menu/RepositoryMenu.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React, { useMemo } from 'react'
-import { Container, Layout } from '@harness/uicore'
-import { Render } from 'react-jsx-match'
-import { useRouteMatch } from 'react-router-dom'
-import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
-import { useStrings } from 'framework/strings'
-import { routes } from 'RouteDefinitions'
-import { NavMenu } from './NavMenu'
-
-export const RepositoryMenu: React.FC = () => {
-  const { space, repoMetadata, gitRef } = useGetRepositoryMetadata()
-  const { getString } = useStrings()
-  const repoPath = useMemo(() => repoMetadata?.path || '', [repoMetadata])
-  const routeMatch = useRouteMatch()
-  const isFilesSelected = useMemo(
-    () => routeMatch.path === '/:space/:repoName' || routeMatch.path.startsWith('/:space/:repoName/edit'),
-    [routeMatch]
-  )
-
-  return (
-    <Container padding={{ top: 'medium' }}>
-      <Layout.Vertical spacing="small">
-        <NavMenu
-          icon={repoMetadata ? 'main-chevron-left' : undefined}
-          textProps={{
-            iconProps: {
-              size: 12
-            }
-          }}
-          label={getString('repositories')}
-          to={routes.toCODERepositories({ space })}
-          isDeselected={!!repoMetadata}
-        />
-
-        <Render when={repoMetadata}>
-          <Container>
-            <Layout.Vertical spacing="small">
-              <NavMenu
-                data-code-repo-section="files"
-                icon="code-file-light"
-                isSubLink
-                isSelected={isFilesSelected}
-                textProps={{
-                  iconProps: {
-                    size: 18
-                  }
-                }}
-                label={getString('files')}
-                to={routes.toCODERepository({ repoPath, gitRef })}
-              />
-
-              <NavMenu
-                data-code-repo-section="commits"
-                icon="git-commit"
-                isSubLink
-                textProps={{
-                  iconProps: {
-                    size: 16
-                  }
-                }}
-                label={getString('commits')}
-                to={routes.toCODECommits({
-                  repoPath,
-                  commitRef: ''
-                })}
-              />
-
-              <NavMenu
-                data-code-repo-section="branches"
-                isSubLink
-                icon="git-branch"
-                textProps={{
-                  iconProps: {
-                    size: 14
-                  }
-                }}
-                label={getString('branches')}
-                to={routes.toCODEBranches({
-                  repoPath
-                })}
-              />
-
-              <NavMenu
-                data-code-repo-section="tags"
-                isSubLink
-                icon="code-tag"
-                textProps={{
-                  iconProps: {
-                    size: 18
-                    // className: css.tagIcon
-                  }
-                }}
-                label={getString('tags')}
-                to={routes.toCODETags({
-                  repoPath
-                })}
-              />
-
-              <NavMenu
-                data-code-repo-section="pull-requests"
-                isSubLink
-                icon="git-pull"
-                textProps={{
-                  iconProps: {
-                    size: 14
-                  }
-                }}
-                label={getString('pullRequests')}
-                to={routes.toCODEPullRequests({
-                  repoPath
-                })}
-              />
-
-              <NavMenu
-                data-code-repo-section="branches"
-                isSubLink
-                icon="code-webhook"
-                textProps={{
-                  iconProps: {
-                    size: 20
-                  }
-                }}
-                label={getString('webhooks')}
-                to={routes.toCODEWebhooks({
-                  repoPath
-                })}
-              />
-
-              <NavMenu
-                data-code-repo-section="settings"
-                isSubLink
-                icon="code-settings"
-                textProps={{
-                  iconProps: {
-                    size: 20
-                  }
-                }}
-                label={getString('settings')}
-                to={routes.toCODESettings({
-                  repoPath
-                })}
-              />
-            </Layout.Vertical>
-          </Container>
-        </Render>
-      </Layout.Vertical>
-    </Container>
-  )
-}
diff --git a/web/src/pages/Home/Home.module.scss b/web/src/pages/Home/Home.module.scss
new file mode 100644
index 000000000..04468c9cf
--- /dev/null
+++ b/web/src/pages/Home/Home.module.scss
@@ -0,0 +1,12 @@
+.main {
+  min-height: var(--page-min-height, 100%);
+  background-color: var(--primary-bg) !important;
+}
+.container {
+  height: 100vh;
+}
+
+.spaceContainer {
+  height: 100vh;
+  padding-top: 26% !important;
+}
diff --git a/web/src/pages/Home/Home.module.scss.d.ts b/web/src/pages/Home/Home.module.scss.d.ts
new file mode 100644
index 000000000..09847d79d
--- /dev/null
+++ b/web/src/pages/Home/Home.module.scss.d.ts
@@ -0,0 +1,8 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly main: string
+  readonly container: string
+  readonly spaceContainer: string
+}
+export default styles
diff --git a/web/src/pages/Home/Home.tsx b/web/src/pages/Home/Home.tsx
index 6b170b5ab..b05397325 100644
--- a/web/src/pages/Home/Home.tsx
+++ b/web/src/pages/Home/Home.tsx
@@ -1,6 +1,62 @@
 import React from 'react'
-import { Container } from '@harness/uicore'
+import { ButtonVariation, Container, FontVariation, Layout, PageBody, Text } from '@harness/uicore'
+import { useGet } from 'restful-react'
+// import type { TypesSpace } from 'services/code'
+import { useStrings } from 'framework/strings'
+// import { usePageIndex } from 'hooks/usePageIndex'
+import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner'
+import { useAppContext } from 'AppContext'
+import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
+import { NewSpaceModalButton } from 'components/NewSpaceModalButton/NewSpaceModalButton'
+import css from './Home.module.scss'
 
 export default function Home() {
-  return <Container>HOME - DASHBOARD</Container>
+  const { getString } = useStrings()
+  // const [searchTerm, setSearchTerm] = useState('')
+  // const [page, setPage] = usePageIndex(1)
+  const { currentUser } = useAppContext()
+  const { space } = useGetRepositoryMetadata()
+
+  const spaces = []
+  const { refetch } = useGet({
+    path: '/api/v1/user/memberships'
+  })
+  const NewSpaceButton = (
+    <NewSpaceModalButton
+      space={space}
+      modalTitle={getString('createSpace')}
+      text={getString('createSpace')}
+      variation={ButtonVariation.PRIMARY}
+      icon="plus"
+      width={173}
+      height={48}
+      onRefetch={refetch}
+    />
+  )
+  return (
+    <Container className={css.main}>
+      <PageBody
+        error={false}
+        // retryOnError={voidFn(refetch)}
+      >
+        <LoadingSpinner visible={false} />
+
+        {spaces.length == 0 ? (
+          <Container className={css.container} flex={{ justifyContent: 'center', align: 'center-center' }}>
+            <Layout.Vertical className={css.spaceContainer} spacing="small">
+              <Text font={{ variation: FontVariation.H2 }}>
+                {getString('homepage.welcomeText', {
+                  currentUser: currentUser?.display_name
+                })}
+              </Text>
+              <Text font={{ variation: FontVariation.BODY1 }}>{getString('homepage.firstStep')} </Text>
+              <Container padding={{ top: 'large' }} flex={{ justifyContent: 'center' }}>
+                {NewSpaceButton}
+              </Container>
+            </Layout.Vertical>
+          </Container>
+        ) : null}
+      </PageBody>
+    </Container>
+  )
 }
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index 7963e1739..3cab27cb0 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -11,7 +11,6 @@ import {
   StringSubstitute,
   Text,
   useToaster,
-  stringSubstitute
 } from '@harness/uicore'
 import { useMutate } from 'restful-react'
 import { Case, Else, Match, Render, Truthy } from 'react-jsx-match'
@@ -28,7 +27,6 @@ import type {
 import { useStrings } from 'framework/strings'
 import { CodeIcon, GitInfoProps, PullRequestFilterOption, PullRequestState } from 'utils/GitUtils'
 import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
-import { useConfirmAct } from 'hooks/useConfirmAction'
 import { useAppContext } from 'AppContext'
 import { Images } from 'images'
 import { getErrorMessage, MergeCheckStatus, permissionProps } from 'utils/Utils'
@@ -123,16 +121,6 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
       desc: getString('pr.mergeOptions.closeDesc')
     }
   ]
-  const confirmAct = useConfirmAct()
-  const permEditResult = hooks?.usePermissionTranslate?.(
-    {
-      resource: {
-        resourceType: 'CODE_REPOSITORY'
-      },
-      permissions: ['code_repo_edit']
-    },
-    [space]
-  )
 
   const [mergeOption, setMergeOption] = useUserPreference<PRMergeOption>(
     UserPreference.PULL_REQUEST_MERGE_STRATEGY,
@@ -311,37 +299,9 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
                             onClick={async () => {
                               if (mergeOption.method !== 'close') {
                                 const payload: OpenapiMergePullReq = { method: mergeOption.method }
-                                let prMergeable = true
-                                const unrsolvedComment = pullRequestMetadata.stats?.unresolved_count || 0
-
-                                // TODO: Verify if permEditResult is enough to be an admin
-                                if (unrsolvedComment > 0) {
-                                  if (permEditResult === true) {
-                                    prMergeable = false
-                                    await confirmAct({
-                                      message: stringSubstitute(getString('pr.forceMergeWithUnresolvedComment'), {
-                                        unrsolvedComment
-                                      }),
-                                      action: async () => {
-                                        prMergeable = true
-                                      }
-                                    })
-                                  } else {
-                                    prMergeable = false
-                                    showError(
-                                      stringSubstitute(getString('pr.notMergeableWithUnresolvedComment'), {
-                                        unrsolvedComment
-                                      }),
-                                      0
-                                    )
-                                  }
-                                }
-
-                                if (prMergeable) {
-                                  mergePR(payload)
-                                    .then(onPRStateChanged)
-                                    .catch(exception => showError(getErrorMessage(exception)))
-                                }
+                                mergePR(payload)
+                                  .then(onPRStateChanged)
+                                  .catch(exception => showError(getErrorMessage(exception)))
                               } else {
                                 updatePRState({ state: 'closed' })
                                   .then(onPRStateChanged)
diff --git a/web/src/pages/PullRequests/PullRequests.tsx b/web/src/pages/PullRequests/PullRequests.tsx
index 203181e40..ca5566a87 100644
--- a/web/src/pages/PullRequests/PullRequests.tsx
+++ b/web/src/pages/PullRequests/PullRequests.tsx
@@ -56,7 +56,9 @@ export default function PullRequests() {
   const [page, setPage] = usePageIndex(pageInit)
 
   useEffect(() => {
-    updateQueryParams({ page: page.toString() })
+    if (page > 1) {
+      updateQueryParams({ page: page.toString() })
+    }
   }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const { repoMetadata, error, loading, refetch } = useGetRepositoryMetadata()
diff --git a/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx b/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
index 9168b3a00..e0f09a661 100644
--- a/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
+++ b/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
@@ -60,6 +60,16 @@ export function PullRequestsContentHeader({
   return (
     <Container className={css.main} padding="xlarge">
       <Layout.Horizontal spacing="medium">
+        <SearchInputWithSpinner
+          loading={loading}
+          spinnerPosition="right"
+          query={searchTerm}
+          setQuery={value => {
+            setSearchTerm(value)
+            onSearchTermChanged(value)
+          }}
+        />
+        <FlexExpander />
         <DropDown
           value={filterOption}
           items={items}
@@ -69,16 +79,6 @@ export function PullRequestsContentHeader({
           }}
           popoverClassName={css.branchDropdown}
         />
-        <SearchInputWithSpinner
-          loading={loading}
-          query={searchTerm}
-          setQuery={value => {
-            setSearchTerm(value)
-            onSearchTermChanged(value)
-          }}
-          spinnerPosition="right"
-        />
-        <FlexExpander />
         <Button
           variation={ButtonVariation.PRIMARY}
           text={getString('newPullRequest')}
diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
index 29eaea210..220ce50ea 100644
--- a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
+++ b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
@@ -41,7 +41,6 @@ export default function RepositoriesListing() {
   const [searchTerm, setSearchTerm] = useState<string | undefined>()
   const { routes } = useAppContext()
   const { updateQueryParams } = useUpdateQueryParams()
-
   const pageBrowser = useQueryParams<PageBrowserProps>()
   const pageInit = pageBrowser.page ? parseInt(pageBrowser.page) : 1
   const [page, setPage] = usePageIndex(pageInit)
diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
index 9a9653d92..d28ad2c4f 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
@@ -138,6 +138,11 @@ export function FileContent({
     },
     lazy: !repoMetadata
   })
+  const editButtonDisabled = useMemo(() => permsFinal.disabled || !isText, [permsFinal.disabled, isText])
+  const editAsText = useMemo(
+    () => editButtonDisabled && !isFileTooLarge && category === FileCategory.OTHER,
+    [editButtonDisabled, isFileTooLarge, category]
+  )
 
   return (
     <Container className={css.tabsContainer} ref={ref}>
@@ -172,11 +177,11 @@ export function FileContent({
                           size={ButtonSize.SMALL}
                           variation={ButtonVariation.TERTIARY}
                           iconProps={{ size: 16 }}
-                          text={getString('edit')}
+                          text={getString(editAsText ? 'editAsText' : 'edit')}
                           icon="code-edit"
                           tooltipProps={{ isDark: true }}
                           tooltip={permsFinal.tooltip}
-                          disabled={permsFinal.disabled || !isText}
+                          disabled={editButtonDisabled && !editAsText}
                           onClick={() => {
                             history.push(
                               routes.toCODEFileEdit({
diff --git a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
index 44b3f0dc3..51b29eb56 100644
--- a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
+++ b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
@@ -47,15 +47,16 @@ export function BranchesContentHeader({
           }}
           popoverClassName={css.branchDropdown}
         /> */}
-        <FlexExpander />
         <SearchInputWithSpinner
           loading={loading}
+          spinnerPosition="right"
           query={searchTerm}
           setQuery={value => {
             setSearchTerm(value)
             onSearchTermChanged(value)
           }}
         />
+        <FlexExpander />
         <CreateBranchModalButton
           text={getString('createBranch')}
           icon={CodeIcon.Add}
diff --git a/web/src/pages/RepositoryCommits/RepositoryCommits.module.scss b/web/src/pages/RepositoryCommits/RepositoryCommits.module.scss
index ef45d5b40..33682b822 100644
--- a/web/src/pages/RepositoryCommits/RepositoryCommits.module.scss
+++ b/web/src/pages/RepositoryCommits/RepositoryCommits.module.scss
@@ -8,7 +8,7 @@
 }
 
 .contentHeader {
-  padding-bottom: var(--spacing-xlarge) !important;
+  padding-bottom: var(--spacing-4) !important;
   > div {
     align-items: center;
   }
diff --git a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
index 2c88242f8..96ffd4f17 100644
--- a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
+++ b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
@@ -55,16 +55,6 @@ export default function RepositoryCommits() {
         repoMetadata={repoMetadata}
         title={getString('commits')}
         dataTooltipId="repositoryCommits"
-        extraBreadcrumbLinks={
-          commitRef && repoMetadata
-            ? [
-                {
-                  label: getString('commits'),
-                  url: routes.toCODECommits({ repoPath: repoMetadata.path as string, commitRef: '' })
-                }
-              ]
-            : undefined
-        }
       />
 
       <PageBody error={getErrorMessage(error || errorCommits)} retryOnError={voidFn(refetch)}>
diff --git a/web/src/pages/RepositoryTags/RepositoryTagsContentHeader/RepositoryTagsContentHeader.tsx b/web/src/pages/RepositoryTags/RepositoryTagsContentHeader/RepositoryTagsContentHeader.tsx
index 042097b29..f40a7a966 100644
--- a/web/src/pages/RepositoryTags/RepositoryTagsContentHeader/RepositoryTagsContentHeader.tsx
+++ b/web/src/pages/RepositoryTags/RepositoryTagsContentHeader/RepositoryTagsContentHeader.tsx
@@ -27,8 +27,8 @@ export function RepositoryTagsContentHeader({
     <Container className={css.main}>
       <Layout.Horizontal spacing="medium">
         <SearchInputWithSpinner
-          spinnerPosition="right"
           loading={loading}
+          spinnerPosition="right"
           query={searchTerm}
           setQuery={value => {
             setSearchTerm(value)
diff --git a/web/src/pages/SignIn/SignIn.tsx b/web/src/pages/SignIn/SignIn.tsx
index c2a0a7ece..2dc2cbd05 100644
--- a/web/src/pages/SignIn/SignIn.tsx
+++ b/web/src/pages/SignIn/SignIn.tsx
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react'
 import { Button, Color, Container, FormInput, Formik, FormikForm, Layout, Text, useToaster } from '@harness/uicore'
 import * as Yup from 'yup'
 
-import { Link, useHistory } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import { useStrings } from 'framework/strings'
 import { useOnLogin } from 'services/code'
 import AuthLayout from 'components/AuthLayout/AuthLayout'
@@ -13,24 +13,28 @@ import css from './SignIn.module.scss'
 
 export const SignIn: React.FC = () => {
   const { getString } = useStrings()
-  const history = useHistory()
   const [, setToken] = useAPIToken()
   const { mutate } = useOnLogin({})
   const { showError } = useToaster()
 
   const onLogin = useCallback(
     (data: LoginForm) => {
-      mutate({ login_identifier: data.username, password: data.password } as unknown as void)
+      mutate(
+        { login_identifier: data.username, password: data.password },
+        {
+          headers: { Authorization: '' }
+        }
+      )
         .then(result => {
           setToken(result.access_token as string)
-          history.replace(routes.toCODESpaces())
+          window.location.replace(window.location.origin + routes.toCODEHome())
         })
 
         .catch(error => {
           showError(getErrorMessage(error))
         })
     },
-    [mutate, history, setToken, showError]
+    [mutate, setToken, showError]
   )
 
   const handleSubmit = (data: LoginForm): void => {
@@ -53,7 +57,7 @@ export const SignIn: React.FC = () => {
             validationSchema={Yup.object().shape({
               username: Yup.string().required(getString('userNameRequired')),
 
-              password: Yup.string().min(6).required(getString('passwordRequired'))
+              password: Yup.string().required(getString('passwordRequired'))
             })}>
             <FormikForm>
               <FormInput.Text name="username" label={getString('email')} disabled={false} />
diff --git a/web/src/pages/SignUp/SignUp.tsx b/web/src/pages/SignUp/SignUp.tsx
index bc5f2a98b..480566b93 100644
--- a/web/src/pages/SignUp/SignUp.tsx
+++ b/web/src/pages/SignUp/SignUp.tsx
@@ -32,16 +32,21 @@ export const SignUp: React.FC = () => {
   const { mutate } = useOnRegister({})
   const onRegister = useCallback(
     (data: RegisterForm) => {
-      mutate({
-        display_name: data.username,
-        email: data.email,
-        uid: data.username,
-        password: data.password
-      } as unknown as void)
+      mutate(
+        {
+          display_name: data.username,
+          email: data.email,
+          uid: data.username,
+          password: data.password
+        },
+        {
+          headers: { Authorization: '' }
+        }
+      )
         .then(result => {
           setToken(result.access_token as string)
           showSuccess(getString('userCreated'))
-          history.replace(routes.toCODESpaces())
+          window.location.replace(window.location.origin + routes.toCODEHome())
         })
         .catch(error => {
           showError(getErrorMessage(error))
diff --git a/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
new file mode 100644
index 000000000..1c20da8f1
--- /dev/null
+++ b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
@@ -0,0 +1,144 @@
+import React, { useMemo, useState } from 'react'
+import { Button, ButtonVariation, Dialog, FormikForm, FormInput, SelectOption, useToaster } from '@harness/uicore'
+import { useModalHook } from '@harness/use-modal'
+import { Formik } from 'formik'
+
+import * as Yup from 'yup'
+
+import { useStrings } from 'framework/strings'
+import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
+import {
+  MembershipAddRequestBody,
+  TypesMembership,
+  TypesPrincipalInfo,
+  useListPrincipals,
+  useMembershipAdd,
+  useMembershipUpdate
+} from 'services/code'
+import { getErrorMessage, LIST_FETCHING_LIMIT } from 'utils/Utils'
+
+import { roleStringKeyMap } from '../SpaceAccessControl'
+
+const roles = ['reader', 'executor', 'contributor', 'space_owner'] as const
+
+const useAddNewMember = ({ onClose }: { onClose: () => void }) => {
+  const [isEditFlow, setIsEditFlow] = useState(false)
+  const [membershipDetails, setMembershipDetails] = useState<TypesMembership>()
+  const [searchTerm, setSearchTerm] = useState('')
+
+  const space = useGetSpaceParam()
+  const { getString } = useStrings()
+  const { showError, showSuccess } = useToaster()
+
+  const { mutate: addMembership } = useMembershipAdd({ space_ref: space })
+  const { mutate: updateMembership } = useMembershipUpdate({
+    space_ref: space,
+    user_uid: membershipDetails?.principal?.uid || ''
+  })
+
+  const { data: users, loading: fetchingUsers } = useListPrincipals({
+    queryParams: {
+      query: searchTerm,
+      page: 1,
+      limit: LIST_FETCHING_LIMIT,
+      type: ['user']
+    },
+    debounce: 500
+  })
+
+  const roleOptions: SelectOption[] = useMemo(
+    () =>
+      roles.map(role => ({
+        value: role,
+        label: getString(roleStringKeyMap[role])
+      })),
+    []
+  )
+
+  const userOptions: SelectOption[] = useMemo(
+    () =>
+      users?.map(user => ({
+        value: user.uid as string,
+        label: (user.display_name || user.email) as string
+      })) || [],
+    [users]
+  )
+
+  const handleClose = () => {
+    setSearchTerm('')
+    hideModal()
+  }
+
+  const [openModal, hideModal] = useModalHook(() => {
+    return (
+      <Dialog
+        isOpen
+        enforceFocus={false}
+        onClose={handleClose}
+        title={isEditFlow ? getString('changeRole') : getString('spaceMemberships.addMember')}>
+        <Formik<MembershipAddRequestBody>
+          initialValues={{
+            user_uid: membershipDetails?.principal?.uid || '',
+            role: membershipDetails?.role || 'reader'
+          }}
+          validationSchema={Yup.object().shape({
+            user_uid: Yup.string().required(getString('validation.uidRequired'))
+          })}
+          onSubmit={async values => {
+            try {
+              if (isEditFlow) {
+                await updateMembership({ role: values.role })
+                showSuccess(getString('spaceMemberships.memberUpdated'))
+              } else {
+                await addMembership(values)
+                showSuccess(getString('spaceMemberships.memberAdded'))
+              }
+
+              handleClose()
+              onClose()
+            } catch (error) {
+              showError(getErrorMessage(error))
+            }
+          }}>
+          <FormikForm>
+            <FormInput.Select
+              usePortal
+              name="user_uid"
+              label={getString('user')}
+              items={userOptions}
+              value={
+                isEditFlow
+                  ? {
+                      label: membershipDetails?.principal?.display_name as string,
+                      value: membershipDetails?.principal?.uid as string
+                    }
+                  : undefined
+              }
+              disabled={isEditFlow}
+              onQueryChange={setSearchTerm}
+              selectProps={{ loadingItems: fetchingUsers }}
+            />
+            <FormInput.Select name="role" label={getString('role')} items={roleOptions} usePortal />
+            <Button
+              type="submit"
+              margin={{ top: 'xxxlarge' }}
+              text={isEditFlow ? getString('save') : getString('addMember')}
+              variation={ButtonVariation.PRIMARY}
+            />
+          </FormikForm>
+        </Formik>
+      </Dialog>
+    )
+  }, [isEditFlow, membershipDetails, userOptions])
+
+  return {
+    openModal: (isEditing?: boolean, memberInfo?: TypesPrincipalInfo) => {
+      openModal()
+      setIsEditFlow(Boolean(isEditing))
+      setMembershipDetails(memberInfo)
+    },
+    hideModal
+  }
+}
+
+export default useAddNewMember
diff --git a/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss b/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss
new file mode 100644
index 000000000..8caa9ba8d
--- /dev/null
+++ b/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss
@@ -0,0 +1,12 @@
+.mainCtn {
+  height: var(--page-min-height, 100%);
+  background-color: var(--primary-bg) !important;
+
+  .roleBadge {
+    padding: var(--spacing-xsmall) 6px;
+    border-radius: 4px;
+    border: 1px solid var(--grey-200);
+    background: var(--grey-50);
+    width: max-content;
+  }
+}
diff --git a/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss.d.ts b/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss.d.ts
new file mode 100644
index 000000000..c98647169
--- /dev/null
+++ b/web/src/pages/SpaceAccessControl/SpaceAccessControl.module.scss.d.ts
@@ -0,0 +1,7 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly mainCtn: string
+  readonly roleBadge: string
+}
+export default styles
diff --git a/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx b/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx
new file mode 100644
index 000000000..2f73145b2
--- /dev/null
+++ b/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx
@@ -0,0 +1,145 @@
+import React, { useMemo } from 'react'
+import { Avatar, Button, ButtonVariation, Container, Layout, Page, TableV2, Text, useToaster } from '@harness/uicore'
+import { Color, FontVariation } from '@harness/design-system'
+import type { CellProps, Column } from 'react-table'
+
+import { StringKeys, useStrings } from 'framework/strings'
+import { useConfirmAct } from 'hooks/useConfirmAction'
+import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
+import { EnumMembershipRole, TypesMembership, useMembershipDelete, useMembershipList } from 'services/code'
+import { getErrorMessage } from 'utils/Utils'
+import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner'
+import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton'
+
+import useAddNewMember from './AddNewMember/AddNewMember'
+
+import css from './SpaceAccessControl.module.scss'
+
+export const roleStringKeyMap: Record<EnumMembershipRole, StringKeys> = {
+  contributor: 'contributor',
+  executor: 'executor',
+  reader: 'reader',
+  space_owner: 'owner'
+}
+
+const SpaceAccessControl = () => {
+  const { getString } = useStrings()
+  const { showError, showSuccess } = useToaster()
+  const space = useGetSpaceParam()
+
+  const { data, refetch, loading } = useMembershipList({
+    space_ref: space
+  })
+
+  const { openModal } = useAddNewMember({ onClose: refetch })
+
+  const { mutate: deleteMembership } = useMembershipDelete({
+    space_ref: space
+  })
+
+  const onConfirmAct = useConfirmAct()
+  const handleRemoveMember = async (userId: string) =>
+    await onConfirmAct({
+      action: async () => {
+        try {
+          await deleteMembership(userId)
+          refetch()
+          showSuccess(getString('spaceMemberships.removeMembershipToast'))
+        } catch (error) {
+          showError(getErrorMessage(error))
+        }
+      },
+      message: getString('spaceMemberships.removeMembershipMsg'),
+      intent: 'danger',
+      title: getString('spaceMemberships.removeMember')
+    })
+
+  const columns = useMemo(
+    () =>
+      [
+        {
+          Header: getString('user'),
+          width: '30%',
+          Cell: ({ row }: CellProps<TypesMembership>) => (
+            <Layout.Horizontal style={{ alignItems: 'center' }}>
+              <Avatar
+                name={row.original.principal?.display_name}
+                size="normal"
+                hoverCard={false}
+                color={Color.WHITE}
+                backgroundColor={Color.PRIMARY_7}
+              />
+              <Text font={{ variation: FontVariation.SMALL_SEMI }} lineClamp={1}>
+                {row.original.principal?.display_name}
+              </Text>
+            </Layout.Horizontal>
+          )
+        },
+        {
+          Header: getString('role'),
+          width: '40%',
+          Cell: ({ row }: CellProps<TypesMembership>) => {
+            const stringKey = row.original.role ? roleStringKeyMap[row.original.role] : undefined
+
+            return (
+              <Text font={{ variation: FontVariation.TINY_SEMI }} color={Color.PRIMARY_9} className={css.roleBadge}>
+                {stringKey ? getString(stringKey) : row.original.role}
+              </Text>
+            )
+          }
+        },
+        {
+          Header: getString('email'),
+          width: '25%',
+          Cell: ({ row }: CellProps<TypesMembership>) => (
+            <Text font={{ variation: FontVariation.SMALL_SEMI }} lineClamp={1}>
+              {row.original.principal?.email}
+            </Text>
+          )
+        },
+        {
+          accessor: 'action',
+          width: '5%',
+          Cell: ({ row }: CellProps<TypesMembership>) => {
+            return (
+              <OptionsMenuButton
+                tooltipProps={{ isDark: true }}
+                items={[
+                  {
+                    text: getString('spaceMemberships.removeMember'),
+                    onClick: () => handleRemoveMember(row.original.principal?.uid as string)
+                  },
+                  {
+                    text: getString('spaceMemberships.changeRole'),
+                    onClick: () => openModal(true, row.original)
+                  }
+                ]}
+              />
+            )
+          }
+        }
+      ] as Column<TypesMembership>[],
+    []
+  )
+
+  return (
+    <Container className={css.mainCtn}>
+      <Page.Header title={getString('accessControl')} />
+      <Page.Body>
+        <Container padding="xlarge">
+          <LoadingSpinner visible={loading} />
+          <Button
+            icon="plus"
+            text={getString('newMember')}
+            variation={ButtonVariation.PRIMARY}
+            margin={{ bottom: 'medium' }}
+            onClick={() => openModal()}
+          />
+          <TableV2 data={data || []} columns={columns} />
+        </Container>
+      </Page.Body>
+    </Container>
+  )
+}
+
+export default SpaceAccessControl
diff --git a/web/src/pages/SpaceSettings/SpaceSettings.module.scss b/web/src/pages/SpaceSettings/SpaceSettings.module.scss
new file mode 100644
index 000000000..2ec326f2e
--- /dev/null
+++ b/web/src/pages/SpaceSettings/SpaceSettings.module.scss
@@ -0,0 +1,56 @@
+.mainCtn {
+  height: var(--page-min-height, 100%);
+  background-color: var(--primary-bg) !important;
+
+  .roleBadge {
+    text-transform: capitalize;
+    padding: var(--spacing-xsmall) 6px;
+    border-radius: 4px;
+    border: 1px solid var(--grey-200);
+    background: var(--grey-50);
+    width: max-content;
+  }
+}
+
+.label {
+  width: 7%;
+  padding-right: var(--spacing-medium);
+}
+
+.content {
+  width: 93%;
+}
+
+.deleteContainer {
+  display: flex;
+  justify-content: space-between;
+}
+
+.saveBtn {
+  margin-left: var(--spacing-medium) !important;
+}
+
+.textContainer {
+  width: 80%;
+}
+
+.buttonContainer {
+  width: 20%;
+}
+
+.generalContainer {
+  width: 100%;
+  background: var(--grey-0) !important;
+  box-shadow: 0px 0px 1px rgba(40, 41, 61, 0.08), 0px 0.5px 2px rgba(96, 97, 112, 0.16);
+  border-radius: 4px;
+}
+
+.yellowContainer {
+  background: #fcf4e3 !important;
+  padding: var(--spacing-medium) var(--spacing-small);
+  border-radius: 4px;
+}
+
+.verticalContainer {
+  width: 100% !important;
+}
diff --git a/web/src/pages/SpaceSettings/SpaceSettings.module.scss.d.ts b/web/src/pages/SpaceSettings/SpaceSettings.module.scss.d.ts
new file mode 100644
index 000000000..53d284a3c
--- /dev/null
+++ b/web/src/pages/SpaceSettings/SpaceSettings.module.scss.d.ts
@@ -0,0 +1,16 @@
+/* eslint-disable */
+// this is an auto-generated file
+declare const styles: {
+  readonly mainCtn: string
+  readonly roleBadge: string
+  readonly label: string
+  readonly content: string
+  readonly deleteContainer: string
+  readonly saveBtn: string
+  readonly textContainer: string
+  readonly buttonContainer: string
+  readonly generalContainer: string
+  readonly yellowContainer: string
+  readonly verticalContainer: string
+}
+export default styles
diff --git a/web/src/pages/SpaceSettings/SpaceSettings.tsx b/web/src/pages/SpaceSettings/SpaceSettings.tsx
new file mode 100644
index 000000000..3d2ef305d
--- /dev/null
+++ b/web/src/pages/SpaceSettings/SpaceSettings.tsx
@@ -0,0 +1,198 @@
+import React, { useState } from 'react'
+import {
+  Button,
+  Color,
+  Text,
+  Container,
+  FormInput,
+  Formik,
+  Layout,
+  Page,
+  ButtonVariation,
+  ButtonSize,
+  Intent
+} from '@harness/uicore'
+import { useGetSpace } from 'services/code'
+import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata'
+import { ACCESS_MODES, voidFn } from 'utils/Utils'
+import { useStrings } from 'framework/strings'
+import css from './SpaceSettings.module.scss'
+
+export default function SpaceSettings() {
+  const { space } = useGetRepositoryMetadata()
+  const { data } = useGetSpace({ space_ref: encodeURIComponent(space), lazy: !space })
+  const [editName, setEditName] = useState(ACCESS_MODES.VIEW)
+
+  const [editDesc, setEditDesc] = useState(ACCESS_MODES.VIEW)
+  const { getString } = useStrings()
+
+  return (
+    <Container className={css.mainCtn}>
+      <Page.Header title={getString('spaceSetting.setting')} />
+      <Page.Body>
+        <Container padding="xlarge">
+          <Formik
+            formName="spaceGeneralSettings"
+            initialValues={{
+              name: data?.uid,
+              desc: data?.description
+            }}
+            onSubmit={voidFn(() => {})}>
+            {formik => {
+              return (
+                <Layout.Vertical padding={{ top: 'medium' }}>
+                  <Container padding="large" margin={{ bottom: 'medium' }} className={css.generalContainer}>
+                    <Layout.Horizontal padding={{ bottom: 'medium' }}>
+                      <Container className={css.label}>
+                        <Text padding={{ top: 'small' }} color={Color.GREY_600} font={{ size: 'small' }}>
+                          {getString('name')}
+                        </Text>
+                      </Container>
+                      <Container className={css.content}>
+                        {editName === ACCESS_MODES.EDIT ? (
+                          <Layout.Horizontal>
+                            <FormInput.Text name="name" className={css.textContainer} />
+                            <Layout.Horizontal className={css.buttonContainer}>
+                              <Button
+                                className={css.saveBtn}
+                                margin={{ right: 'medium' }}
+                                type="submit"
+                                text={getString('save')}
+                                variation={ButtonVariation.SECONDARY}
+                                size={ButtonSize.SMALL}
+                                onClick={() => {
+                                  // mutate({ description: formik.values?.name })
+                                  //   .then(() => {
+                                  //     showSuccess(getString('spaceUpdate'))
+                                  //   })
+                                  //   .catch(err => {
+                                  //     showError(err)
+                                  //   })
+                                  setEditName(ACCESS_MODES.VIEW)
+                                  // refetch()
+                                }}
+                              />
+                              <Button
+                                text={getString('cancel')}
+                                variation={ButtonVariation.TERTIARY}
+                                size={ButtonSize.SMALL}
+                                onClick={() => {
+                                  setEditName(ACCESS_MODES.VIEW)
+                                }}
+                              />
+                            </Layout.Horizontal>
+                          </Layout.Horizontal>
+                        ) : (
+                          <Text color={Color.GREY_800} font={{ size: 'small' }}>
+                            {formik?.values?.name || data?.uid}
+                            <Button
+                              text={getString('edit')}
+                              icon="Edit"
+                              variation={ButtonVariation.LINK}
+                              onClick={() => {
+                                setEditName(ACCESS_MODES.EDIT)
+                              }}
+                              // {...permissionProps(permEditResult, standalone)}
+                            />
+                          </Text>
+                        )}
+                      </Container>
+                    </Layout.Horizontal>
+                    <Layout.Horizontal>
+                      <Container className={css.label}>
+                        <Text padding={{ top: 'small' }} color={Color.GREY_600} font={{ size: 'small' }}>
+                          {getString('description')}
+                        </Text>
+                      </Container>
+                      <Container className={css.content}>
+                        {editDesc === ACCESS_MODES.EDIT ? (
+                          <Layout.Horizontal>
+                            <FormInput.Text name="desc" className={css.textContainer} />
+                            <Layout.Horizontal className={css.buttonContainer}>
+                              <Button
+                                className={css.saveBtn}
+                                margin={{ right: 'medium' }}
+                                type="submit"
+                                text={getString('save')}
+                                variation={ButtonVariation.SECONDARY}
+                                size={ButtonSize.SMALL}
+                                onClick={() => {
+                                  // mutate({ description: formik.values?.desc })
+                                  //   .then(() => {
+                                  //     showSuccess(getString('repoUpdate'))
+                                  //   })
+                                  //   .catch(err => {
+                                  //     showError(err)
+                                  //   })
+                                  setEditDesc(ACCESS_MODES.VIEW)
+                                  // refetch()
+                                }}
+                              />
+                              <Button
+                                text={getString('cancel')}
+                                variation={ButtonVariation.TERTIARY}
+                                size={ButtonSize.SMALL}
+                                onClick={() => {
+                                  setEditDesc(ACCESS_MODES.VIEW)
+                                }}
+                              />
+                            </Layout.Horizontal>
+                          </Layout.Horizontal>
+                        ) : (
+                          <Text color={Color.GREY_800} font={{ size: 'small' }}>
+                            {formik?.values?.desc || data?.description}
+                            <Button
+                              text={getString('edit')}
+                              icon="Edit"
+                              variation={ButtonVariation.LINK}
+                              onClick={() => {
+                                setEditDesc(ACCESS_MODES.EDIT)
+                              }}
+                              // {...permissionProps(permEditResult, standalone)}
+                            />
+                          </Text>
+                        )}
+                      </Container>
+                    </Layout.Horizontal>
+                  </Container>
+                  <Container padding="medium" className={css.generalContainer}>
+                    <Container className={css.deleteContainer}>
+                      <Layout.Vertical className={css.verticalContainer}>
+                        <Text icon="main-trash" color={Color.GREY_600} font={{ size: 'small' }}>
+                          {getString('dangerDeleteRepo')}
+                        </Text>
+                        <Layout.Horizontal padding={{ top: 'medium' }} flex={{ justifyContent: 'space-between' }}>
+                          <Container className={css.yellowContainer}>
+                            <Text
+                              icon="main-issue"
+                              iconProps={{ size: 16, color: Color.ORANGE_700 }}
+                              padding={{ left: 'large', right: 'large', top: 'small', bottom: 'small' }}
+                              color={Color.WARNING}>
+                              {getString('spaceSetting.intentText', {
+                                space: data?.uid
+                              })}
+                            </Text>
+                          </Container>
+                          <Button
+                            disabled={true} // TODO: Disable until backend has soft delete
+                            intent={Intent.DANGER}
+                            onClick={() => {
+                              // confirmDeleteBranch()
+                            }}
+                            variation={ButtonVariation.SECONDARY}
+                            text={getString('deleteSpace')}
+                            // {...permissionProps(permDeleteResult, standalone)}
+                          ></Button>
+                        </Layout.Horizontal>
+                      </Layout.Vertical>
+                    </Container>
+                  </Container>
+                </Layout.Vertical>
+              )
+            }}
+          </Formik>
+        </Container>
+      </Page.Body>
+    </Container>
+  )
+}
diff --git a/web/src/pages/Spaces/Spaces.module.scss b/web/src/pages/Spaces/Spaces.module.scss
deleted file mode 100644
index 6a417a3a7..000000000
--- a/web/src/pages/Spaces/Spaces.module.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.main {
-  display: flex;
-  flex-direction: column;
-
-  .pageHeading {
-    height: 73px;
-  }
-
-  .pageContent {
-    background-color: var(--primary-bg) !important;
-    flex-grow: 1;
-  }
-}
diff --git a/web/src/pages/Spaces/Spaces.tsx b/web/src/pages/Spaces/Spaces.tsx
deleted file mode 100644
index 307d7091d..000000000
--- a/web/src/pages/Spaces/Spaces.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react'
-import { Container, Heading } from '@harness/uicore'
-import { Link } from 'react-router-dom'
-import { routes } from 'RouteDefinitions'
-import { useStrings } from 'framework/strings'
-import css from './Spaces.module.scss'
-
-export default function Spaces() {
-  const { getString } = useStrings()
-
-  return (
-    <Container className={css.main}>
-      <Heading className={css.pageHeading} level={1}>
-        {getString('spaces')}
-      </Heading>
-      <Container className={css.pageContent}>
-        <Link to={routes.toCODERepositories({ space: 'root' })}>Test Space</Link>
-      </Container>
-    </Container>
-  )
-}
diff --git a/web/src/pages/UserProfile/NewToken/NewToken.tsx b/web/src/pages/UserProfile/NewToken/NewToken.tsx
index db395107f..05be2b0c4 100644
--- a/web/src/pages/UserProfile/NewToken/NewToken.tsx
+++ b/web/src/pages/UserProfile/NewToken/NewToken.tsx
@@ -1,13 +1,16 @@
-import React, { useMemo } from 'react'
+import React, { useMemo, useState } from 'react'
 import {
   Button,
   ButtonVariation,
   Color,
+  Container,
   Dialog,
+  FlexExpander,
   FontVariation,
   FormikForm,
   FormInput,
   Layout,
+  SelectOption,
   Text
 } from '@harness/uicore'
 import { useModalHook } from '@harness/use-modal'
@@ -15,77 +18,136 @@ import { Formik } from 'formik'
 import { useMutate } from 'restful-react'
 import moment from 'moment'
 import * as Yup from 'yup'
-
-import { REGEX_VALID_REPO_NAME } from 'utils/Utils'
+import { Else, Match, Render, Truthy } from 'react-jsx-match'
+import { omit } from 'lodash-es'
 
 import { useStrings } from 'framework/strings'
+import type { OpenapiCreateTokenRequest } from 'services/code'
+import { REGEX_VALID_REPO_NAME } from 'utils/Utils'
+import { CodeIcon } from 'utils/GitUtils'
+import { CopyButton } from 'components/CopyButton/CopyButton'
+import { FormInputWithCopyButton } from 'components/UserManagementFlows/AddUserModal'
+
+import css from 'components/CloneCredentialDialog/CloneCredentialDialog.module.scss'
 
 const useNewToken = ({ onClose }: { onClose: () => void }) => {
   const { getString } = useStrings()
   const { mutate } = useMutate({ path: '/api/v1/user/tokens', verb: 'POST' })
 
-  const lifeTimeOptions = useMemo(
+  const [generatedToken, setGeneratedToken] = useState<string>()
+  const isTokenGenerated = Boolean(generatedToken)
+
+  const lifeTimeOptions: SelectOption[] = useMemo(
     () => [
       { label: getString('nDays', { number: 7 }), value: 604800000000000 },
       { label: getString('nDays', { number: 30 }), value: 2592000000000000 },
       { label: getString('nDays', { number: 60 }), value: 5184000000000000 },
-      { label: getString('nDays', { number: 90 }), value: 7776000000000000 }
+      { label: getString('nDays', { number: 90 }), value: 7776000000000000 },
+      { label: getString('noExpiration'), value: Infinity }
     ],
     [getString]
   )
 
+  const onModalClose = () => {
+    setGeneratedToken('')
+    hideModal()
+    onClose()
+  }
+
   const [openModal, hideModal] = useModalHook(() => {
     return (
-      <Dialog isOpen enforceFocus={false} onClose={hideModal} title={getString('createNewToken')}>
-        <Formik
+      <Dialog isOpen enforceFocus={false} onClose={onModalClose} title={getString('createNewToken')}>
+        <Formik<OpenapiCreateTokenRequest>
           initialValues={{
-            uid: '',
-            lifeTime: 0
+            uid: ''
           }}
           validationSchema={Yup.object().shape({
             uid: Yup.string()
               .required(getString('validation.nameIsRequired'))
               .matches(REGEX_VALID_REPO_NAME, getString('validation.nameInvalid')),
-            lifeTime: Yup.number().required(getString('validation.expirationDateRequired'))
+            lifetime: Yup.number().required(getString('validation.expirationDateRequired'))
           })}
           onSubmit={async values => {
-            await mutate(values)
-            hideModal()
-            onClose()
+            let payload = { ...values }
+
+            if (payload.lifetime === Infinity) {
+              payload = omit(payload, 'lifetime')
+            }
+
+            const res = await mutate(payload)
+            setGeneratedToken(res?.access_token)
           }}>
           {formikProps => {
-            const expiresAtString = moment(Date.now() + formikProps.values.lifeTime / 1000000).format(
-              'dddd, MMMM DD YYYY'
-            )
+            const lifetime = formikProps.values.lifetime || 0
+            const expiresAtString = moment(Date.now() + lifetime / 1000000).format('dddd, MMMM DD YYYY')
 
             return (
               <FormikForm>
-                <FormInput.Text
+                <FormInputWithCopyButton
                   name="uid"
                   label={getString('name')}
                   placeholder={getString('newToken.namePlaceholder')}
+                  disabled={isTokenGenerated}
                 />
-                <FormInput.Select name="lifeTime" label={getString('expiration')} items={lifeTimeOptions} usePortal />
-                {formikProps.values.lifeTime ? (
-                  <Text font={{ variation: FontVariation.SMALL_SEMI }} color={Color.GREY_400}>
-                    {getString('newToken.expireOn', { date: expiresAtString })}
+                <FormInput.Select
+                  name="lifetime"
+                  label={getString('expiration')}
+                  items={lifeTimeOptions}
+                  usePortal
+                  disabled={isTokenGenerated}
+                />
+                {lifetime ? (
+                  <Text
+                    font={{ variation: FontVariation.SMALL_SEMI }}
+                    color={Color.GREY_400}
+                    margin={{ bottom: 'medium' }}>
+                    {lifetime === Infinity
+                      ? getString('noExpirationDate')
+                      : getString('newToken.expireOn', { date: expiresAtString })}
                   </Text>
                 ) : null}
-                <Layout.Horizontal margin={{ top: 'xxxlarge' }} spacing="medium">
-                  <Button
-                    text={getString('newToken.generateToken')}
-                    type="submit"
-                    variation={ButtonVariation.PRIMARY}
-                  />
-                  <Button text={getString('cancel')} onClick={hideModal} variation={ButtonVariation.TERTIARY} />
-                </Layout.Horizontal>
+                <Render when={isTokenGenerated}>
+                  <Text padding={{ bottom: 'small' }} font={{ variation: FontVariation.FORM_LABEL, size: 'small' }}>
+                    {getString('token')}
+                  </Text>
+                  <Container padding={{ bottom: 'medium' }}>
+                    <Layout.Horizontal className={css.layout}>
+                      <Text className={css.url}>{generatedToken}</Text>
+                      <FlexExpander />
+                      <CopyButton
+                        content={generatedToken || ''}
+                        id={css.cloneCopyButton}
+                        icon={CodeIcon.Copy}
+                        iconProps={{ size: 14 }}
+                      />
+                    </Layout.Horizontal>
+                  </Container>
+                  <Text padding={{ bottom: 'medium' }} font={{ variation: FontVariation.BODY2_SEMI, size: 'small' }}>
+                    {getString('newToken.tokenHelptext')}
+                  </Text>
+                </Render>
+                <Match expr={isTokenGenerated}>
+                  <Truthy>
+                    <Button text={getString('close')} variation={ButtonVariation.TERTIARY} onClick={onModalClose} />
+                  </Truthy>
+                  <Else>
+                    <Layout.Horizontal margin={{ top: 'xxxlarge' }} spacing="medium">
+                      <Button
+                        text={getString('newToken.generateToken')}
+                        type="submit"
+                        variation={ButtonVariation.PRIMARY}
+                      />
+                      <Button text={getString('cancel')} onClick={hideModal} variation={ButtonVariation.TERTIARY} />
+                    </Layout.Horizontal>
+                  </Else>
+                </Match>
               </FormikForm>
             )
           }}
         </Formik>
       </Dialog>
     )
-  }, [])
+  }, [generatedToken])
 
   return {
     openModal,
diff --git a/web/src/pages/UserProfile/UserProfile.tsx b/web/src/pages/UserProfile/UserProfile.tsx
index 8f3b389a7..849149120 100644
--- a/web/src/pages/UserProfile/UserProfile.tsx
+++ b/web/src/pages/UserProfile/UserProfile.tsx
@@ -6,7 +6,6 @@ import {
   ButtonVariation,
   Card,
   Container,
-  FlexExpander,
   Layout,
   Page,
   TableV2,
@@ -48,7 +47,7 @@ const UserProfile = () => {
   const { data: userTokens, loading: tokensLoading, refetch: refetchTokens } = useGet({ path: USER_TOKENS_API_PATH })
   const { mutate: deleteToken } = useMutate({ path: USER_TOKENS_API_PATH, verb: 'DELETE' })
 
-  const [_, setToken] = useAPIToken()
+  const [, setToken] = useAPIToken()
 
   const onLogout = async () => {
     await logoutUser()
@@ -92,7 +91,7 @@ const UserProfile = () => {
         Header: getString('status'),
         width: '20%',
         Cell: ({ row }: CellProps<TypesToken>) => {
-          const isActive = +Date.now() < Number(row.original.expires_at)
+          const isActive = !row.original.expires_at || +Date.now() < Number(row.original.expires_at)
 
           return (
             <Text
@@ -112,7 +111,9 @@ const UserProfile = () => {
         Cell: ({ row }: CellProps<TypesToken>) => {
           return (
             <Text font={{ variation: FontVariation.SMALL }} color={Color.GREY_500} lineClamp={1}>
-              {moment(row.original.expires_at).format('MMM Do, YYYY h:mm:ss a')}
+              {row.original.expires_at
+                ? moment(row.original.expires_at).format('MMM Do, YYYY h:mm:ss a')
+                : getString('noExpiration')}
             </Text>
           )
         }
@@ -164,7 +165,14 @@ const UserProfile = () => {
       <Page.Body>
         <Container className={css.pageCtn}>
           <Card className={css.profileCard}>
-            <Avatar name={currentUser?.display_name} size="large" hoverCard={false} />
+            <Avatar
+              name={currentUser?.display_name}
+              size="large"
+              hoverCard={false}
+              color={Color.WHITE}
+              backgroundColor={Color.PRIMARY_7}
+              borderColor={Color.PRIMARY_8}
+            />
             <Container className={css.detailsCtn}>
               <Layout.Horizontal className={css.detailField}>
                 <Text width={150} font={{ variation: FontVariation.SMALL }} color={Color.GREY_600}>
diff --git a/web/src/pages/UsersListing/UsersListing.tsx b/web/src/pages/UsersListing/UsersListing.tsx
index 28b16d9d6..a6b65661e 100644
--- a/web/src/pages/UsersListing/UsersListing.tsx
+++ b/web/src/pages/UsersListing/UsersListing.tsx
@@ -77,7 +77,13 @@ const UsersListing = () => {
         Cell: ({ row }: CellProps<TypesUser>) => {
           return (
             <Layout.Horizontal style={{ alignItems: 'center' }}>
-              <Avatar name={row.original.display_name} size="normal" hoverCard={false} />
+              <Avatar
+                name={row.original.display_name}
+                size="normal"
+                hoverCard={false}
+                color={Color.WHITE}
+                backgroundColor={Color.PRIMARY_7}
+              />
               <Text font={{ variation: FontVariation.SMALL_SEMI }} margin={{ right: 'small' }} lineClamp={1}>
                 {row.original.display_name}
               </Text>
diff --git a/web/src/pages/Webhooks/WebhooksHeader/WebhooksHeader.tsx b/web/src/pages/Webhooks/WebhooksHeader/WebhooksHeader.tsx
index 987ec6407..09343d554 100644
--- a/web/src/pages/Webhooks/WebhooksHeader/WebhooksHeader.tsx
+++ b/web/src/pages/Webhooks/WebhooksHeader/WebhooksHeader.tsx
@@ -21,14 +21,8 @@ export function WebhooksHeader({ repoMetadata, loading, onSearchTermChanged }: W
   return (
     <Container className={css.main} padding="xlarge">
       <Layout.Horizontal spacing="medium">
-        <Button
-          variation={ButtonVariation.PRIMARY}
-          text={getString('createWebhook')}
-          icon={CodeIcon.Add}
-          onClick={() => history.push(routes.toCODEWebhookNew({ repoPath: repoMetadata?.path as string }))}
-        />
-        <FlexExpander />
         <SearchInputWithSpinner
+          spinnerPosition="right"
           loading={loading}
           query={searchTerm}
           setQuery={value => {
@@ -36,6 +30,13 @@ export function WebhooksHeader({ repoMetadata, loading, onSearchTermChanged }: W
             onSearchTermChanged(value)
           }}
         />
+        <FlexExpander />
+        <Button
+          variation={ButtonVariation.PRIMARY}
+          text={getString('createWebhook')}
+          icon={CodeIcon.Add}
+          onClick={() => history.push(routes.toCODEWebhookNew({ repoPath: repoMetadata?.path as string }))}
+        />
       </Layout.Horizontal>
     </Container>
   )
diff --git a/web/src/services/code/index.tsx b/web/src/services/code/index.tsx
index 6a172e20c..e9ba2d77c 100644
--- a/web/src/services/code/index.tsx
+++ b/web/src/services/code/index.tsx
@@ -13,6 +13,8 @@ export type EnumCheckStatus = 'error' | 'failure' | 'pending' | 'running' | 'suc
 
 export type EnumContentEncodingType = 'base64' | 'utf8'
 
+export type EnumMembershipRole = 'contributor' | 'executor' | 'reader' | 'space_owner'
+
 export type EnumMergeCheckStatus = string
 
 export type EnumMergeMethod = 'merge' | 'squash' | 'rebase'
@@ -60,18 +62,6 @@ export type EnumWebhookTrigger =
   | 'tag_deleted'
   | 'tag_updated'
 
-export interface FormDataOpenapiLoginRequest {
-  password?: string
-  username?: string
-}
-
-export interface FormDataOpenapiRegisterRequest {
-  displayname?: string
-  email?: string
-  password?: string
-  username?: string
-}
-
 export interface GitrpcBlamePart {
   commit?: GitrpcCommit
   lines?: string[] | null
@@ -184,7 +174,7 @@ export interface OpenapiCreateRepositoryRequest {
   git_ignore?: string
   is_public?: boolean
   license?: string
-  parent_id?: number
+  parent_ref?: string
   readme?: boolean
   uid?: string
 }
@@ -192,7 +182,7 @@ export interface OpenapiCreateRepositoryRequest {
 export interface OpenapiCreateSpaceRequest {
   description?: string
   is_public?: boolean
-  parent_id?: number
+  parent_ref?: string
   uid?: string
 }
 
@@ -231,6 +221,11 @@ export interface OpenapiGetContentOutput {
   type?: OpenapiContentType
 }
 
+export interface OpenapiLoginRequest {
+  login_identifier?: string
+  password?: string
+}
+
 export interface OpenapiMergePullReq {
   method?: EnumMergeMethod
   source_sha?: string
@@ -238,16 +233,23 @@ export interface OpenapiMergePullReq {
 
 export interface OpenapiMoveRepoRequest {
   keep_as_alias?: boolean
-  parent_id?: number | null
+  parent_ref?: string | null
   uid?: string | null
 }
 
 export interface OpenapiMoveSpaceRequest {
   keep_as_alias?: boolean
-  parent_id?: number | null
+  parent_ref?: string | null
   uid?: string | null
 }
 
+export interface OpenapiRegisterRequest {
+  display_name?: string
+  email?: string
+  password?: string
+  uid?: string
+}
+
 export interface OpenapiReportStatusCheckResultRequest {
   check_uid?: string
   link?: string
@@ -447,6 +449,14 @@ export interface TypesListCommitResponse {
   rename_details?: TypesRenameDetails[] | null
 }
 
+export interface TypesMembership {
+  added_by?: TypesPrincipalInfo
+  created?: number
+  principal?: TypesPrincipalInfo
+  role?: EnumMembershipRole
+  updated?: number
+}
+
 export interface TypesPath {
   created?: number
   created_by?: number
@@ -776,10 +786,45 @@ export const useAdminUpdateUser = ({ user_uid, ...props }: UseAdminUpdateUserPro
     { base: getConfig('code'), pathParams: { user_uid }, ...props }
   )
 
-export type OnLoginProps = Omit<MutateProps<TypesTokenResponse, UsererrorError, void, void, void>, 'path' | 'verb'>
+export interface UpdateUserAdminPathParams {
+  user_uid: string
+}
+
+export type UpdateUserAdminProps = Omit<
+  MutateProps<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>,
+  'path' | 'verb'
+> &
+  UpdateUserAdminPathParams
+
+export const UpdateUserAdmin = ({ user_uid, ...props }: UpdateUserAdminProps) => (
+  <Mutate<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>
+    verb="PATCH"
+    path={`/admin/users/${user_uid}/admin`}
+    base={getConfig('code')}
+    {...props}
+  />
+)
+
+export type UseUpdateUserAdminProps = Omit<
+  UseMutateProps<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>,
+  'path' | 'verb'
+> &
+  UpdateUserAdminPathParams
+
+export const useUpdateUserAdmin = ({ user_uid, ...props }: UseUpdateUserAdminProps) =>
+  useMutate<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>(
+    'PATCH',
+    (paramsInPath: UpdateUserAdminPathParams) => `/admin/users/${paramsInPath.user_uid}/admin`,
+    { base: getConfig('code'), pathParams: { user_uid }, ...props }
+  )
+
+export type OnLoginProps = Omit<
+  MutateProps<TypesTokenResponse, UsererrorError, void, OpenapiLoginRequest, void>,
+  'path' | 'verb'
+>
 
 export const OnLogin = (props: OnLoginProps) => (
-  <Mutate<TypesTokenResponse, UsererrorError, void, void, void>
+  <Mutate<TypesTokenResponse, UsererrorError, void, OpenapiLoginRequest, void>
     verb="POST"
     path={`/login`}
     base={getConfig('code')}
@@ -788,12 +833,12 @@ export const OnLogin = (props: OnLoginProps) => (
 )
 
 export type UseOnLoginProps = Omit<
-  UseMutateProps<TypesTokenResponse, UsererrorError, void, void, void>,
+  UseMutateProps<TypesTokenResponse, UsererrorError, void, OpenapiLoginRequest, void>,
   'path' | 'verb'
 >
 
 export const useOnLogin = (props: UseOnLoginProps) =>
-  useMutate<TypesTokenResponse, UsererrorError, void, void, void>('POST', `/login`, {
+  useMutate<TypesTokenResponse, UsererrorError, void, OpenapiLoginRequest, void>('POST', `/login`, {
     base: getConfig('code'),
     ...props
   })
@@ -856,10 +901,13 @@ export const useListPrincipals = (props: UseListPrincipalsProps) =>
     ...props
   })
 
-export type OnRegisterProps = Omit<MutateProps<TypesTokenResponse, UsererrorError, void, void, void>, 'path' | 'verb'>
+export type OnRegisterProps = Omit<
+  MutateProps<TypesTokenResponse, UsererrorError, void, OpenapiRegisterRequest, void>,
+  'path' | 'verb'
+>
 
 export const OnRegister = (props: OnRegisterProps) => (
-  <Mutate<TypesTokenResponse, UsererrorError, void, void, void>
+  <Mutate<TypesTokenResponse, UsererrorError, void, OpenapiRegisterRequest, void>
     verb="POST"
     path={`/register`}
     base={getConfig('code')}
@@ -868,12 +916,12 @@ export const OnRegister = (props: OnRegisterProps) => (
 )
 
 export type UseOnRegisterProps = Omit<
-  UseMutateProps<TypesTokenResponse, UsererrorError, void, void, void>,
+  UseMutateProps<TypesTokenResponse, UsererrorError, void, OpenapiRegisterRequest, void>,
   'path' | 'verb'
 >
 
 export const useOnRegister = (props: UseOnRegisterProps) =>
-  useMutate<TypesTokenResponse, UsererrorError, void, void, void>('POST', `/register`, {
+  useMutate<TypesTokenResponse, UsererrorError, void, OpenapiRegisterRequest, void>('POST', `/register`, {
     base: getConfig('code'),
     ...props
   })
@@ -3069,6 +3117,142 @@ export const useUpdateSpace = ({ space_ref, ...props }: UseUpdateSpaceProps) =>
     { base: getConfig('code'), pathParams: { space_ref }, ...props }
   )
 
+export interface MembershipListPathParams {
+  space_ref: string
+}
+
+export type MembershipListProps = Omit<
+  GetProps<TypesMembership[], UsererrorError, void, MembershipListPathParams>,
+  'path'
+> &
+  MembershipListPathParams
+
+export const MembershipList = ({ space_ref, ...props }: MembershipListProps) => (
+  <Get<TypesMembership[], UsererrorError, void, MembershipListPathParams>
+    path={`/spaces/${space_ref}/members`}
+    base={getConfig('code')}
+    {...props}
+  />
+)
+
+export type UseMembershipListProps = Omit<
+  UseGetProps<TypesMembership[], UsererrorError, void, MembershipListPathParams>,
+  'path'
+> &
+  MembershipListPathParams
+
+export const useMembershipList = ({ space_ref, ...props }: UseMembershipListProps) =>
+  useGet<TypesMembership[], UsererrorError, void, MembershipListPathParams>(
+    (paramsInPath: MembershipListPathParams) => `/spaces/${paramsInPath.space_ref}/members`,
+    { base: getConfig('code'), pathParams: { space_ref }, ...props }
+  )
+
+export interface MembershipAddPathParams {
+  space_ref: string
+}
+
+export interface MembershipAddRequestBody {
+  role?: EnumMembershipRole
+  user_uid?: string
+}
+
+export type MembershipAddProps = Omit<
+  MutateProps<TypesMembership, UsererrorError, void, MembershipAddRequestBody, MembershipAddPathParams>,
+  'path' | 'verb'
+> &
+  MembershipAddPathParams
+
+export const MembershipAdd = ({ space_ref, ...props }: MembershipAddProps) => (
+  <Mutate<TypesMembership, UsererrorError, void, MembershipAddRequestBody, MembershipAddPathParams>
+    verb="POST"
+    path={`/spaces/${space_ref}/members`}
+    base={getConfig('code')}
+    {...props}
+  />
+)
+
+export type UseMembershipAddProps = Omit<
+  UseMutateProps<TypesMembership, UsererrorError, void, MembershipAddRequestBody, MembershipAddPathParams>,
+  'path' | 'verb'
+> &
+  MembershipAddPathParams
+
+export const useMembershipAdd = ({ space_ref, ...props }: UseMembershipAddProps) =>
+  useMutate<TypesMembership, UsererrorError, void, MembershipAddRequestBody, MembershipAddPathParams>(
+    'POST',
+    (paramsInPath: MembershipAddPathParams) => `/spaces/${paramsInPath.space_ref}/members`,
+    { base: getConfig('code'), pathParams: { space_ref }, ...props }
+  )
+
+export interface MembershipDeletePathParams {
+  space_ref: string
+}
+
+export type MembershipDeleteProps = Omit<
+  MutateProps<void, UsererrorError, void, string, MembershipDeletePathParams>,
+  'path' | 'verb'
+> &
+  MembershipDeletePathParams
+
+export const MembershipDelete = ({ space_ref, ...props }: MembershipDeleteProps) => (
+  <Mutate<void, UsererrorError, void, string, MembershipDeletePathParams>
+    verb="DELETE"
+    path={`/spaces/${space_ref}/members`}
+    base={getConfig('code')}
+    {...props}
+  />
+)
+
+export type UseMembershipDeleteProps = Omit<
+  UseMutateProps<void, UsererrorError, void, string, MembershipDeletePathParams>,
+  'path' | 'verb'
+> &
+  MembershipDeletePathParams
+
+export const useMembershipDelete = ({ space_ref, ...props }: UseMembershipDeleteProps) =>
+  useMutate<void, UsererrorError, void, string, MembershipDeletePathParams>(
+    'DELETE',
+    (paramsInPath: MembershipDeletePathParams) => `/spaces/${paramsInPath.space_ref}/members`,
+    { base: getConfig('code'), pathParams: { space_ref }, ...props }
+  )
+
+export interface MembershipUpdatePathParams {
+  space_ref: string
+  user_uid: string
+}
+
+export interface MembershipUpdateRequestBody {
+  role?: EnumMembershipRole
+}
+
+export type MembershipUpdateProps = Omit<
+  MutateProps<TypesMembership, UsererrorError, void, MembershipUpdateRequestBody, MembershipUpdatePathParams>,
+  'path' | 'verb'
+> &
+  MembershipUpdatePathParams
+
+export const MembershipUpdate = ({ space_ref, user_uid, ...props }: MembershipUpdateProps) => (
+  <Mutate<TypesMembership, UsererrorError, void, MembershipUpdateRequestBody, MembershipUpdatePathParams>
+    verb="PATCH"
+    path={`/spaces/${space_ref}/members/${user_uid}`}
+    base={getConfig('code')}
+    {...props}
+  />
+)
+
+export type UseMembershipUpdateProps = Omit<
+  UseMutateProps<TypesMembership, UsererrorError, void, MembershipUpdateRequestBody, MembershipUpdatePathParams>,
+  'path' | 'verb'
+> &
+  MembershipUpdatePathParams
+
+export const useMembershipUpdate = ({ space_ref, user_uid, ...props }: UseMembershipUpdateProps) =>
+  useMutate<TypesMembership, UsererrorError, void, MembershipUpdateRequestBody, MembershipUpdatePathParams>(
+    'PATCH',
+    (paramsInPath: MembershipUpdatePathParams) => `/spaces/${paramsInPath.space_ref}/members/${paramsInPath.user_uid}`,
+    { base: getConfig('code'), pathParams: { space_ref, user_uid }, ...props }
+  )
+
 export interface MoveSpacePathParams {
   space_ref: string
 }
@@ -3375,38 +3559,6 @@ export const useUpdateUser = (props: UseUpdateUserProps) =>
     ...props
   })
 
-export interface UpdateUserAdminPathParams {
-  user_uid: string
-}
-
-export type UpdateUserAdminProps = Omit<
-  MutateProps<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>,
-  'path' | 'verb'
-> &
-  UpdateUserAdminPathParams
-
-export const UpdateUserAdmin = ({ user_uid, ...props }: UpdateUserAdminProps) => (
-  <Mutate<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>
-    verb="PATCH"
-    path={`/user/${user_uid}/admin`}
-    base={getConfig('code')}
-    {...props}
-  />
-)
-
-export type UseUpdateUserAdminProps = Omit<
-  UseMutateProps<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>,
-  'path' | 'verb'
-> &
-  UpdateUserAdminPathParams
-
-export const useUpdateUserAdmin = ({ user_uid, ...props }: UseUpdateUserAdminProps) =>
-  useMutate<TypesUser, UsererrorError, void, OpenapiUpdateAdminRequest, UpdateUserAdminPathParams>(
-    'PATCH',
-    (paramsInPath: UpdateUserAdminPathParams) => `/user/${paramsInPath.user_uid}/admin`,
-    { base: getConfig('code'), pathParams: { user_uid }, ...props }
-  )
-
 export type CreateTokenProps = Omit<
   MutateProps<TypesTokenResponse, UsererrorError, void, OpenapiCreateTokenRequest, void>,
   'path' | 'verb'
diff --git a/web/src/services/code/swagger.yaml b/web/src/services/code/swagger.yaml
index 2bf9fd056..aed4b9471 100644
--- a/web/src/services/code/swagger.yaml
+++ b/web/src/services/code/swagger.yaml
@@ -201,14 +201,49 @@ paths:
           description: Internal Server Error
       tags:
         - admin
+  /admin/users/{user_uid}/admin:
+    patch:
+      operationId: updateUserAdmin
+      parameters:
+        - in: path
+          name: user_uid
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OpenapiUpdateAdminRequest'
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TypesUser'
+          description: OK
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Not Found
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Internal Server Error
+      tags:
+        - admin
   /login:
     post:
       operationId: onLogin
       requestBody:
         content:
-          application/x-www-form-urlencoded:
+          application/json:
             schema:
-              $ref: '#/components/schemas/FormDataOpenapiLoginRequest'
+              $ref: '#/components/schemas/OpenapiLoginRequest'
       responses:
         '200':
           content:
@@ -342,9 +377,9 @@ paths:
       operationId: onRegister
       requestBody:
         content:
-          application/x-www-form-urlencoded:
+          application/json:
             schema:
-              $ref: '#/components/schemas/FormDataOpenapiRegisterRequest'
+              $ref: '#/components/schemas/OpenapiRegisterRequest'
       responses:
         '200':
           content:
@@ -3589,6 +3624,198 @@ paths:
           description: Internal Server Error
       tags:
         - space
+  /spaces/{space_ref}/members:
+    get:
+      operationId: membershipList
+      parameters:
+        - in: path
+          name: space_ref
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                items:
+                  $ref: '#/components/schemas/TypesMembership'
+                type: array
+          description: OK
+        '401':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Unauthorized
+        '403':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Forbidden
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Not Found
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Internal Server Error
+      tags:
+        - space
+    post:
+      operationId: membershipAdd
+      parameters:
+        - in: path
+          name: space_ref
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              properties:
+                role:
+                  $ref: '#/components/schemas/EnumMembershipRole'
+                user_uid:
+                  type: string
+              type: object
+      responses:
+        '201':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TypesMembership'
+          description: Created
+        '401':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Unauthorized
+        '403':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Forbidden
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Not Found
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Internal Server Error
+      tags:
+        - space
+  /spaces/{space_ref}/members/{user_uid}:
+    delete:
+      operationId: membershipDelete
+      parameters:
+        - in: path
+          name: space_ref
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: user_uid
+          required: true
+          schema:
+            type: string
+      responses:
+        '204':
+          description: No Content
+        '401':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Unauthorized
+        '403':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Forbidden
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Not Found
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Internal Server Error
+      tags:
+        - space
+    patch:
+      operationId: membershipUpdate
+      parameters:
+        - in: path
+          name: space_ref
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: user_uid
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              properties:
+                role:
+                  $ref: '#/components/schemas/EnumMembershipRole'
+              type: object
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TypesMembership'
+          description: OK
+        '401':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Unauthorized
+        '403':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Forbidden
+        '404':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Not Found
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UsererrorError'
+          description: Internal Server Error
+      tags:
+        - space
   /spaces/{space_ref}/move:
     post:
       operationId: moveSpace
@@ -4050,41 +4277,6 @@ paths:
           description: Internal Server Error
       tags:
         - user
-  /user/{user_uid}/admin:
-    patch:
-      operationId: updateUserAdmin
-      parameters:
-        - in: path
-          name: user_uid
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OpenapiUpdateAdminRequest'
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TypesUser'
-          description: OK
-        '404':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/UsererrorError'
-          description: Not Found
-        '500':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/UsererrorError'
-          description: Internal Server Error
-      tags:
-        - user
   /user/token:
     post:
       operationId: createToken
@@ -4129,6 +4321,13 @@ components:
         - base64
         - utf8
       type: string
+    EnumMembershipRole:
+      enum:
+        - contributor
+        - executor
+        - reader
+        - space_owner
+      type: string
     EnumMergeCheckStatus:
       type: string
     EnumMergeMethod:
@@ -4217,24 +4416,6 @@ components:
         - tag_deleted
         - tag_updated
       type: string
-    FormDataOpenapiLoginRequest:
-      properties:
-        password:
-          type: string
-        username:
-          type: string
-      type: object
-    FormDataOpenapiRegisterRequest:
-      properties:
-        displayname:
-          type: string
-        email:
-          type: string
-        password:
-          type: string
-        username:
-          type: string
-      type: object
     GitrpcBlamePart:
       properties:
         commit:
@@ -4435,8 +4616,8 @@ components:
           type: boolean
         license:
           type: string
-        parent_id:
-          type: integer
+        parent_ref:
+          type: string
         readme:
           type: boolean
         uid:
@@ -4448,8 +4629,8 @@ components:
           type: string
         is_public:
           type: boolean
-        parent_id:
-          type: integer
+        parent_ref:
+          type: string
         uid:
           type: string
       type: object
@@ -4516,6 +4697,13 @@ components:
         type:
           $ref: '#/components/schemas/OpenapiContentType'
       type: object
+    OpenapiLoginRequest:
+      properties:
+        login_identifier:
+          type: string
+        password:
+          type: string
+      type: object
     OpenapiMergePullReq:
       properties:
         method:
@@ -4527,9 +4715,9 @@ components:
       properties:
         keep_as_alias:
           type: boolean
-        parent_id:
+        parent_ref:
           nullable: true
-          type: integer
+          type: string
         uid:
           nullable: true
           type: string
@@ -4538,13 +4726,24 @@ components:
       properties:
         keep_as_alias:
           type: boolean
-        parent_id:
+        parent_ref:
           nullable: true
-          type: integer
+          type: string
         uid:
           nullable: true
           type: string
       type: object
+    OpenapiRegisterRequest:
+      properties:
+        display_name:
+          type: string
+        email:
+          type: string
+        password:
+          type: string
+        uid:
+          type: string
+      type: object
     OpenapiReportStatusCheckResultRequest:
       properties:
         check_uid:
@@ -4872,6 +5071,19 @@ components:
           nullable: true
           type: array
       type: object
+    TypesMembership:
+      properties:
+        added_by:
+          $ref: '#/components/schemas/TypesPrincipalInfo'
+        created:
+          type: integer
+        principal:
+          $ref: '#/components/schemas/TypesPrincipalInfo'
+        role:
+          $ref: '#/components/schemas/EnumMembershipRole'
+        updated:
+          type: integer
+      type: object
     TypesPath:
       properties:
         created:
diff --git a/web/src/utils/Utils.ts b/web/src/utils/Utils.ts
index a1422f957..7ecf960cd 100644
--- a/web/src/utils/Utils.ts
+++ b/web/src/utils/Utils.ts
@@ -4,6 +4,11 @@ import { get } from 'lodash-es'
 import moment from 'moment'
 import langMap from 'lang-map'
 
+export enum ACCESS_MODES {
+  VIEW,
+  EDIT
+}
+
 export const LIST_FETCHING_LIMIT = 20
 export const DEFAULT_DATE_FORMAT = 'MM/DD/YYYY hh:mm a'
 export const DEFAULT_BRANCH_NAME = 'main'
diff --git a/web/src/utils/vars.scss b/web/src/utils/vars.scss
new file mode 100644
index 000000000..0294615c9
--- /dev/null
+++ b/web/src/utils/vars.scss
@@ -0,0 +1,8 @@
+/*
+ * This file defines global CSS variables used in Gitness.
+ */
+@mixin vars {
+  --nav-menu-width: 232px;
+  --nav-background: #f2f6fb;
+  --page-background: #fbfcfd;
+}