diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go
index 4751ec9095..8089e7ca10 100644
--- a/server/channels/api4/apitestlib.go
+++ b/server/channels/api4/apitestlib.go
@@ -786,7 +786,7 @@ func (th *TestHelper) CreateMessagePostWithClient(client *model.Client4, channel
 }
 
 func (th *TestHelper) CreateMessagePostNoClient(channel *model.Channel, message string, createAtTime int64) *model.Post {
-	post, err := th.App.Srv().Store().Post().Save(&model.Post{
+	post, err := th.App.Srv().Store().Post().Save(th.Context, &model.Post{
 		UserId:    th.BasicUser.Id,
 		ChannelId: channel.Id,
 		Message:   message,
diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go
index ba918a85aa..a9f42b5c55 100644
--- a/server/channels/app/channel_test.go
+++ b/server/channels/app/channel_test.go
@@ -2646,7 +2646,7 @@ func TestConvertGroupMessageToChannel(t *testing.T) {
 
 	mockPostStore := mocks.PostStore{}
 	mockStore.On("Post").Return(&mockPostStore)
-	mockPostStore.On("Save", mock.AnythingOfType("*model.Post")).Return(&model.Post{}, nil)
+	mockPostStore.On("Save", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("*model.Post")).Return(&model.Post{}, nil)
 	mockPostStore.On("InvalidateLastPostTimeCache", "channelidchannelidchanneli")
 
 	mockSystemStore := mocks.SystemStore{}
diff --git a/server/channels/app/post.go b/server/channels/app/post.go
index c52846d4f9..2bb98a5b4a 100644
--- a/server/channels/app/post.go
+++ b/server/channels/app/post.go
@@ -305,7 +305,7 @@ func (a *App) CreatePost(c request.CTX, post *model.Post, channel *model.Channel
 		post.AddProp(model.PostPropsPreviewedPost, previewPost.PostID)
 	}
 
-	rpost, nErr := a.Srv().Store().Post().Save(post)
+	rpost, nErr := a.Srv().Store().Post().Save(c, post)
 	if nErr != nil {
 		var appErr *model.AppError
 		var invErr *store.ErrInvalidInput
diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go
index f7667be18c..ab1bd8c58e 100644
--- a/server/channels/store/opentracinglayer/opentracinglayer.go
+++ b/server/channels/store/opentracinglayer/opentracinglayer.go
@@ -6802,7 +6802,7 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(rctx request.CTX, user
 	return err
 }
 
-func (s *OpenTracingLayerPostStore) Save(post *model.Post) (*model.Post, error) {
+func (s *OpenTracingLayerPostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
 	origCtx := s.Root.Store.Context()
 	span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.Save")
 	s.Root.Store.SetContext(newCtx)
@@ -6811,7 +6811,7 @@ func (s *OpenTracingLayerPostStore) Save(post *model.Post) (*model.Post, error)
 	}()
 
 	defer span.Finish()
-	result, err := s.PostStore.Save(post)
+	result, err := s.PostStore.Save(rctx, post)
 	if err != nil {
 		span.LogFields(spanlog.Error(err))
 		ext.Error.Set(span, true)
diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go
index 67198bd230..8b10f785ca 100644
--- a/server/channels/store/retrylayer/retrylayer.go
+++ b/server/channels/store/retrylayer/retrylayer.go
@@ -7712,11 +7712,11 @@ func (s *RetryLayerPostStore) PermanentDeleteByUser(rctx request.CTX, userID str
 
 }
 
-func (s *RetryLayerPostStore) Save(post *model.Post) (*model.Post, error) {
+func (s *RetryLayerPostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
 
 	tries := 0
 	for {
-		result, err := s.PostStore.Save(post)
+		result, err := s.PostStore.Save(rctx, post)
 		if err == nil {
 			return result, nil
 		}
diff --git a/server/channels/store/searchlayer/post_layer.go b/server/channels/store/searchlayer/post_layer.go
index defc6cc4b5..ea3563729b 100644
--- a/server/channels/store/searchlayer/post_layer.go
+++ b/server/channels/store/searchlayer/post_layer.go
@@ -96,11 +96,8 @@ func (s *SearchPostStore) Overwrite(rctx request.CTX, post *model.Post) (*model.
 	return post, err
 }
 
-func (s SearchPostStore) Save(post *model.Post) (*model.Post, error) {
-	// TODO: Use the actuall request context from the App layer
-	// https://mattermost.atlassian.net/browse/MM-55735
-	rctx := request.EmptyContext(s.rootStore.Logger())
-	npost, err := s.PostStore.Save(post)
+func (s SearchPostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
+	npost, err := s.PostStore.Save(rctx, post)
 
 	if err == nil {
 		s.indexPost(rctx, npost)
diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go
index cce62ae3b0..da789dc3d1 100644
--- a/server/channels/store/searchtest/helper.go
+++ b/server/channels/store/searchtest/helper.go
@@ -369,7 +369,7 @@ func (th *SearchTestHelper) createPost(userID, channelID, message, hashtags, pos
 		creationTime = createAt
 	}
 	postModel := th.createPostModel(userID, channelID, message, hashtags, postType, creationTime, pinned)
-	return th.Store.Post().Save(postModel)
+	return th.Store.Post().Save(th.Context, postModel)
 }
 
 func (th *SearchTestHelper) createFileInfoModel(creatorID, postID, channelID, name, content, extension, mimeType string, createAt, size int64) *model.FileInfo {
@@ -401,7 +401,7 @@ func (th *SearchTestHelper) createFileInfo(creatorID, postID, channelID, name, c
 func (th *SearchTestHelper) createReply(userID, message, hashtags string, parent *model.Post, createAt int64, pinned bool) (*model.Post, error) {
 	replyModel := th.createPostModel(userID, parent.ChannelId, message, hashtags, parent.Type, createAt, pinned)
 	replyModel.RootId = parent.Id
-	return th.Store.Post().Save(replyModel)
+	return th.Store.Post().Save(th.Context, replyModel)
 }
 
 func (th *SearchTestHelper) deleteUserPosts(userID string) error {
diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go
index b4b22f251a..6626862325 100644
--- a/server/channels/store/sqlstore/integrity_test.go
+++ b/server/channels/store/sqlstore/integrity_test.go
@@ -177,22 +177,22 @@ func createOutgoingWebhook(ss store.Store, userId, channelId, teamId string) *mo
 	return wh
 }
 
-func createPost(ss store.Store, channelId, userId, rootId, parentId string) *model.Post {
+func createPost(rctx request.CTX, ss store.Store, channelId, userId, rootId, parentId string) *model.Post {
 	m := model.Post{}
 	m.ChannelId = channelId
 	m.UserId = userId
 	m.RootId = rootId
 	m.Message = "zz" + model.NewId() + "b"
-	p, _ := ss.Post().Save(&m)
+	p, _ := ss.Post().Save(rctx, &m)
 	return p
 }
 
-func createPostWithChannelId(ss store.Store, id string) *model.Post {
-	return createPost(ss, id, model.NewId(), "", "")
+func createPostWithChannelId(rctx request.CTX, ss store.Store, id string) *model.Post {
+	return createPost(rctx, ss, id, model.NewId(), "", "")
 }
 
-func createPostWithUserId(ss store.Store, id string) *model.Post {
-	return createPost(ss, model.NewId(), id, "", "")
+func createPostWithUserId(rctx request.CTX, ss store.Store, id string) *model.Post {
+	return createPost(rctx, ss, model.NewId(), id, "", "")
 }
 
 func createPreferences(ss store.Store, userId string) model.Preferences {
@@ -569,7 +569,7 @@ func TestCheckChannelsPostsIntegrity(t *testing.T) {
 		})
 
 		t.Run("should generate a report with one record", func(t *testing.T) {
-			post := createPostWithChannelId(ss, model.NewId())
+			post := createPostWithChannelId(rctx, ss, model.NewId())
 			result := checkChannelsPostsIntegrity(store)
 			require.NoError(t, result.Err)
 			data := result.Data.(model.RelationalIntegrityCheckData)
@@ -653,9 +653,9 @@ func TestCheckPostsPostsRootIdIntegrity(t *testing.T) {
 
 		t.Run("should generate a report with one record", func(t *testing.T) {
 			channel := createChannel(ss, model.NewId(), model.NewId())
-			root := createPost(ss, channel.Id, model.NewId(), "", "")
+			root := createPost(rctx, ss, channel.Id, model.NewId(), "", "")
 			rootId := root.Id
-			post := createPost(ss, channel.Id, model.NewId(), root.Id, root.Id)
+			post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id)
 			dbmap.Exec(`DELETE FROM Posts WHERE Id=?`, root.Id)
 			result := checkPostsPostsRootIdIntegrity(store)
 			require.NoError(t, result.Err)
@@ -1402,7 +1402,7 @@ func TestCheckUsersPostsIntegrity(t *testing.T) {
 		})
 
 		t.Run("should generate a report with one record", func(t *testing.T) {
-			post := createPostWithUserId(ss, model.NewId())
+			post := createPostWithUserId(rctx, ss, model.NewId())
 			result := checkUsersPostsIntegrity(store)
 			require.NoError(t, result.Err)
 			data := result.Data.(model.RelationalIntegrityCheckData)
@@ -1623,8 +1623,8 @@ func TestCheckThreadsTeamsIntegrity(t *testing.T) {
 		t.Run("should generate a report with one record", func(t *testing.T) {
 			team := createTeam(ss)
 			channel := createChannel(ss, team.Id, model.NewId())
-			root := createPost(ss, channel.Id, model.NewId(), "", "")
-			post := createPost(ss, channel.Id, model.NewId(), root.Id, root.Id)
+			root := createPost(rctx, ss, channel.Id, model.NewId(), "", "")
+			post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id)
 
 			dbmap.Exec(`DELETE FROM Teams WHERE Id=?`, team.Id)
 			result := checkThreadsTeamsIntegrity(store)
diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go
index e3a64b2aed..1e9c649842 100644
--- a/server/channels/store/sqlstore/post_store.go
+++ b/server/channels/store/sqlstore/post_store.go
@@ -282,7 +282,7 @@ func (s *SqlPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, er
 	return posts, -1, nil
 }
 
-func (s *SqlPostStore) Save(post *model.Post) (*model.Post, error) {
+func (s *SqlPostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
 	posts, _, err := s.SaveMultiple([]*model.Post{post})
 	if err != nil {
 		return nil, err
diff --git a/server/channels/store/store.go b/server/channels/store/store.go
index d689cc884c..7e028a8f5d 100644
--- a/server/channels/store/store.go
+++ b/server/channels/store/store.go
@@ -350,7 +350,7 @@ type ThreadStore interface {
 
 type PostStore interface {
 	SaveMultiple(posts []*model.Post) ([]*model.Post, int, error)
-	Save(post *model.Post) (*model.Post, error)
+	Save(rctx request.CTX, post *model.Post) (*model.Post, error)
 	Update(rctx request.CTX, newPost *model.Post, oldPost *model.Post) (*model.Post, error)
 	Get(ctx context.Context, id string, opts model.GetPostsOptions, userID string, sanitizeOptions map[string]bool) (*model.PostList, error)
 	GetSingle(id string, inclDeleted bool) (*model.Post, error)
diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go
index ddac9bd710..9596c381b5 100644
--- a/server/channels/store/storetest/channel_store.go
+++ b/server/channels/store/storetest/channel_store.go
@@ -705,7 +705,7 @@ func testChannelStoreGetForPost(t *testing.T, rctx request.CTX, ss store.Store)
 	o1, nErr := ss.Channel().Save(ch, -1)
 	require.NoError(t, nErr)
 
-	p1, err := ss.Post().Save(&model.Post{
+	p1, err := ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o1.Id,
 		Message:   "test",
@@ -4611,28 +4611,28 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		channelId := model.NewId()
 
-		p1, err := ss.Post().Save(&model.Post{
+		p1, err := ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1000,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1001,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId2,
 			ChannelId: channelId,
 			CreateAt:  1002,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId3,
 			ChannelId: channelId,
 			CreateAt:  1003,
@@ -4661,14 +4661,14 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		channelId := model.NewId()
 
-		p1, err := ss.Post().Save(&model.Post{
+		p1, err := ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1000,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1001,
@@ -4690,14 +4690,14 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		channelId := model.NewId()
 
-		p1, err := ss.Post().Save(&model.Post{
+		p1, err := ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1000,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1001,
@@ -4705,7 +4705,7 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1002,
@@ -4713,7 +4713,7 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1003,
@@ -4721,7 +4721,7 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		p5, err := ss.Post().Save(&model.Post{
+		p5, err := ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1004,
@@ -4729,7 +4729,7 @@ func testCountPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1005,
@@ -4763,7 +4763,7 @@ func testCountUrgentPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		channelId := model.NewId()
 
-		p1, err := ss.Post().Save(&model.Post{
+		p1, err := ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1000,
@@ -4777,7 +4777,7 @@ func testCountUrgentPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId1,
 			ChannelId: channelId,
 			CreateAt:  1001,
@@ -4791,14 +4791,14 @@ func testCountUrgentPostsAfter(t *testing.T, rctx request.CTX, ss store.Store) {
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId2,
 			ChannelId: channelId,
 			CreateAt:  1002,
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			UserId:    userId3,
 			ChannelId: channelId,
 			CreateAt:  1003,
@@ -5089,7 +5089,7 @@ func testChannelStoreGetMemberForPost(t *testing.T, rctx request.CTX, ss store.S
 	})
 	require.NoError(t, err)
 
-	p1, nErr := ss.Post().Save(&model.Post{
+	p1, nErr := ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o1.Id,
 		Message:   "test",
@@ -6947,7 +6947,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto
 	o1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
 
-	p1, err := ss.Post().Save(&model.Post{
+	p1, err := ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o1.Id,
 		Message:   "test",
@@ -6969,7 +6969,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto
 	o2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o2.Id,
 		Message:   "test",
@@ -6992,7 +6992,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto
 
 		userId := model.NewId()
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    userId,
 			Message:   "message",
@@ -7001,7 +7001,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    userId,
 			Message:   "message",
@@ -7010,7 +7010,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, rctx request.CTX, ss store.Sto
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    userId,
 			RootId:    post1.Id,
@@ -7040,7 +7040,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, rctx request.CTX, ss store
 	o1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
 
-	_, err := ss.Post().Save(&model.Post{
+	_, err := ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o1.Id,
 		Message:   "test",
@@ -7048,7 +7048,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, rctx request.CTX, ss store
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o1.Id,
 		Message:   "test",
@@ -7070,14 +7070,14 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, rctx request.CTX, ss store
 	o2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o2.Id,
 		Message:   "test",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		UserId:    model.NewId(),
 		ChannelId: o2.Id,
 		Message:   "test",
diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go
index ecf904ddae..bf191aee89 100644
--- a/server/channels/store/storetest/compliance_store.go
+++ b/server/channels/store/storetest/compliance_store.go
@@ -140,7 +140,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1.UserId = u1.Id
 	o1.CreateAt = model.GetMillis()
 	o1.Message = NewTestId()
-	o1, nErr = ss.Post().Save(o1)
+	o1, nErr = ss.Post().Save(rctx, o1)
 	require.NoError(t, nErr)
 
 	o1a := &model.Post{}
@@ -148,7 +148,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1a.UserId = u1.Id
 	o1a.CreateAt = o1.CreateAt + 10
 	o1a.Message = NewTestId()
-	_, nErr = ss.Post().Save(o1a)
+	_, nErr = ss.Post().Save(rctx, o1a)
 	require.NoError(t, nErr)
 
 	o2 := &model.Post{}
@@ -156,7 +156,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.UserId = u1.Id
 	o2.CreateAt = o1.CreateAt + 20
 	o2.Message = NewTestId()
-	_, nErr = ss.Post().Save(o2)
+	_, nErr = ss.Post().Save(rctx, o2)
 	require.NoError(t, nErr)
 
 	o2a := &model.Post{}
@@ -164,7 +164,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2a.UserId = u2.Id
 	o2a.CreateAt = o1.CreateAt + 30
 	o2a.Message = NewTestId()
-	o2a, nErr = ss.Post().Save(o2a)
+	o2a, nErr = ss.Post().Save(rctx, o2a)
 	require.NoError(t, nErr)
 
 	time.Sleep(100 * time.Millisecond)
@@ -276,7 +276,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 	o1.UserId = u1.Id
 	o1.CreateAt = model.GetMillis()
 	o1.Message = NewTestId()
-	o1, nErr = ss.Post().Save(o1)
+	o1, nErr = ss.Post().Save(rctx, o1)
 	require.NoError(t, nErr)
 
 	o1a := &model.Post{}
@@ -284,7 +284,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 	o1a.UserId = u1.Id
 	o1a.CreateAt = o1.CreateAt + 10
 	o1a.Message = NewTestId()
-	_, nErr = ss.Post().Save(o1a)
+	_, nErr = ss.Post().Save(rctx, o1a)
 	require.NoError(t, nErr)
 
 	o2 := &model.Post{}
@@ -292,7 +292,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 	o2.UserId = u1.Id
 	o2.CreateAt = o1.CreateAt + 20
 	o2.Message = NewTestId()
-	_, nErr = ss.Post().Save(o2)
+	_, nErr = ss.Post().Save(rctx, o2)
 	require.NoError(t, nErr)
 
 	o2a := &model.Post{}
@@ -300,7 +300,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 	o2a.UserId = u2.Id
 	o2a.CreateAt = o1.CreateAt + 30
 	o2a.Message = NewTestId()
-	_, nErr = ss.Post().Save(o2a)
+	_, nErr = ss.Post().Save(rctx, o2a)
 	require.NoError(t, nErr)
 
 	o3 := &model.Post{}
@@ -308,7 +308,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 	o3.UserId = u1.Id
 	o3.CreateAt = o1.CreateAt + 40
 	o3.Message = NewTestId()
-	o3, nErr = ss.Post().Save(o3)
+	o3, nErr = ss.Post().Save(rctx, o3)
 	require.NoError(t, nErr)
 
 	time.Sleep(100 * time.Millisecond)
@@ -363,7 +363,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
 			post.UserId = u1.Id
 			post.CreateAt = createAt
 			post.Message = NewTestId()
-			_, nErr = ss.Post().Save(post)
+			_, nErr = ss.Post().Save(rctx, post)
 			require.NoError(t, nErr)
 		}
 
@@ -456,7 +456,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	post2 := &model.Post{
@@ -465,7 +465,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
 		CreateAt:  startTime + 10,
 		Message:   NewTestId(),
 	}
-	post2, err = ss.Post().Save(post2)
+	post2, err = ss.Post().Save(rctx, post2)
 	require.NoError(t, err)
 
 	// fetch the message exports for both posts that user1 sent
@@ -560,7 +560,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	post2 := &model.Post{
@@ -569,7 +569,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
 		CreateAt:  startTime + 10,
 		Message:   NewTestId(),
 	}
-	post2, err = ss.Post().Save(post2)
+	post2, err = ss.Post().Save(rctx, post2)
 	require.NoError(t, err)
 
 	// fetch the message exports for both posts that user1 sent
@@ -660,7 +660,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
 		CreateAt:  startTime + 20,
 		Message:   NewTestId(),
 	}
-	post, err = ss.Post().Save(post)
+	post, err = ss.Post().Save(rctx, post)
 	require.NoError(t, err)
 
 	// fetch the message export for the post that user1 sent
@@ -758,7 +758,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
 		CreateAt:  startTime + 20,
 		Message:   NewTestId(),
 	}
-	post, err = ss.Post().Save(post)
+	post, err = ss.Post().Save(rctx, post)
 	require.NoError(t, err)
 
 	// fetch the message export for the post that user1 sent
@@ -833,7 +833,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	//user 1 edits the previous post
@@ -925,7 +925,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store)
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	// fetch the message exports from the start
@@ -1036,7 +1036,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	//user 1 deletes the previous post
@@ -1121,7 +1121,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store
 		CreateAt:  startTime,
 		Message:   NewTestId(),
 	}
-	post1, err = ss.Post().Save(post1)
+	post1, err = ss.Post().Save(rctx, post1)
 	require.NoError(t, err)
 
 	// fetch the message exports from the start
diff --git a/server/channels/store/storetest/draft_store.go b/server/channels/store/storetest/draft_store.go
index 6ab7a383cd..ac0ec96fc5 100644
--- a/server/channels/store/storetest/draft_store.go
+++ b/server/channels/store/storetest/draft_store.go
@@ -420,11 +420,11 @@ func clearPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 }
 
-func makeDraftsWithNonDeletedPosts(t *testing.T, ss store.Store, count int, message string) {
+func makeDraftsWithNonDeletedPosts(t *testing.T, rctx request.CTX, ss store.Store, count int, message string) {
 	t.Helper()
 
 	for i := 1; i <= count; i++ {
-		post, err := ss.Post().Save(&model.Post{
+		post, err := ss.Post().Save(rctx, &model.Post{
 			CreateAt:  model.GetMillis(),
 			UpdateAt:  model.GetMillis(),
 			UserId:    model.NewId(),
@@ -451,11 +451,11 @@ func makeDraftsWithNonDeletedPosts(t *testing.T, ss store.Store, count int, mess
 	time.Sleep(5 * time.Millisecond)
 }
 
-func makeDraftsWithDeletedPosts(t *testing.T, ss store.Store, count int, message string) {
+func makeDraftsWithDeletedPosts(t *testing.T, rctx request.CTX, ss store.Store, count int, message string) {
 	t.Helper()
 
 	for i := 1; i <= count; i++ {
-		post, err := ss.Post().Save(&model.Post{
+		post, err := ss.Post().Save(rctx, &model.Post{
 			CreateAt:  model.GetMillis(),
 			UpdateAt:  model.GetMillis(),
 			DeleteAt:  model.GetMillis(),
@@ -714,7 +714,7 @@ func testDeleteOrphanDraftsByCreateAtAndUserId(t *testing.T, rctx request.CTX, s
 		clearDrafts(t, rctx, ss)
 		clearPosts(t, rctx, ss)
 
-		makeDraftsWithDeletedPosts(t, ss, 100, "Okay")
+		makeDraftsWithDeletedPosts(t, rctx, ss, 100, "Okay")
 
 		createAt, userId := int64(0), ""
 		nextCreateAt, nextUserId, err := ss.Draft().GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(createAt, userId)
@@ -735,7 +735,7 @@ func testDeleteOrphanDraftsByCreateAtAndUserId(t *testing.T, rctx request.CTX, s
 		clearDrafts(t, rctx, ss)
 		clearPosts(t, rctx, ss)
 
-		makeDraftsWithDeletedPosts(t, ss, 300, "Okay")
+		makeDraftsWithDeletedPosts(t, rctx, ss, 300, "Okay")
 
 		createAt, userId := int64(0), ""
 		nextCreateAt, nextUserId, err := ss.Draft().GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(createAt, userId)
@@ -772,7 +772,7 @@ func testDeleteOrphanDraftsByCreateAtAndUserId(t *testing.T, rctx request.CTX, s
 		clearDrafts(t, rctx, ss)
 		clearPosts(t, rctx, ss)
 
-		makeDraftsWithNonDeletedPosts(t, ss, 100, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 100, "Okay")
 
 		createAt, userId := int64(0), ""
 		nextCreateAt, nextUserId, err := ss.Draft().GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(createAt, userId)
@@ -794,7 +794,7 @@ func testDeleteOrphanDraftsByCreateAtAndUserId(t *testing.T, rctx request.CTX, s
 		clearDrafts(t, rctx, ss)
 		clearPosts(t, rctx, ss)
 
-		makeDraftsWithNonDeletedPosts(t, ss, 300, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 300, "Okay")
 
 		createAt, userId := int64(0), ""
 		nextCreateAt, nextUserId, err := ss.Draft().GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(createAt, userId)
@@ -837,23 +837,23 @@ func testDeleteOrphanDraftsByCreateAtAndUserId(t *testing.T, rctx request.CTX, s
 
 		// 50 drafts will be deleted from this page
 		makeDrafts(t, ss, 50, "Yup")
-		makeDraftsWithNonDeletedPosts(t, ss, 50, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 50, "Okay")
 
 		// 100 drafts will be deleted from this page
 		makeDrafts(t, ss, 50, "Yup")
-		makeDraftsWithDeletedPosts(t, ss, 50, "Okay")
+		makeDraftsWithDeletedPosts(t, rctx, ss, 50, "Okay")
 
 		// 50 drafts will be deleted from this page
-		makeDraftsWithDeletedPosts(t, ss, 50, "Okay")
-		makeDraftsWithNonDeletedPosts(t, ss, 50, "Okay")
+		makeDraftsWithDeletedPosts(t, rctx, ss, 50, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 50, "Okay")
 
 		// 70 drafts will be deleted from this page
 		makeDrafts(t, ss, 40, "Yup")
-		makeDraftsWithDeletedPosts(t, ss, 30, "Okay")
-		makeDraftsWithNonDeletedPosts(t, ss, 30, "Okay")
+		makeDraftsWithDeletedPosts(t, rctx, ss, 30, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 30, "Okay")
 
 		// No drafts will be deleted from this page
-		makeDraftsWithNonDeletedPosts(t, ss, 100, "Okay")
+		makeDraftsWithNonDeletedPosts(t, rctx, ss, 100, "Okay")
 
 		// Verify initially 5 pages with 500 drafts
 		assert.Equal(t, 5, countDraftPages(t, rctx, ss), "incorrect number of pages")
@@ -949,14 +949,14 @@ func testDeleteDraftsAssociatedWithPost(t *testing.T, rctx request.CTX, ss store
 	})
 	require.NoError(t, err)
 
-	post1, err := ss.Post().Save(&model.Post{
+	post1, err := ss.Post().Save(rctx, &model.Post{
 		UserId:    user1.Id,
 		ChannelId: channel1.Id,
 		Message:   "post1",
 	})
 	require.NoError(t, err)
 
-	post2, err := ss.Post().Save(&model.Post{
+	post2, err := ss.Post().Save(rctx, &model.Post{
 		UserId:    user2.Id,
 		ChannelId: channel2.Id,
 		Message:   "post2",
diff --git a/server/channels/store/storetest/file_info_store.go b/server/channels/store/storetest/file_info_store.go
index 67b2710f4d..78471acdc7 100644
--- a/server/channels/store/storetest/file_info_store.go
+++ b/server/channels/store/storetest/file_info_store.go
@@ -282,7 +282,7 @@ func testFileInfoGetWithOptions(t *testing.T, rctx request.CTX, ss store.Store)
 		post := model.Post{}
 		post.ChannelId = chId
 		post.UserId = user
-		_, err := ss.Post().Save(&post)
+		_, err := ss.Post().Save(rctx, &post)
 		require.NoError(t, err)
 		return &post
 	}
@@ -696,7 +696,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
-	o1, err := ss.Post().Save(o1)
+	o1, err := ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	f1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
 		PostId:    o1.Id,
@@ -714,7 +714,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
 	o2.ChannelId = c2.Id
 	o2.UserId = model.NewId()
 	o2.Message = "zz" + model.NewId() + "CCCCCCCCC"
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	f2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
@@ -734,7 +734,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
 	o3.UserId = model.NewId()
 	o3.RootId = o1.Id
 	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	f3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
diff --git a/server/channels/store/storetest/mocks/PostStore.go b/server/channels/store/storetest/mocks/PostStore.go
index 8f92606387..786affd151 100644
--- a/server/channels/store/storetest/mocks/PostStore.go
+++ b/server/channels/store/storetest/mocks/PostStore.go
@@ -989,25 +989,25 @@ func (_m *PostStore) PermanentDeleteByUser(rctx request.CTX, userID string) erro
 	return r0
 }
 
-// Save provides a mock function with given fields: post
-func (_m *PostStore) Save(post *model.Post) (*model.Post, error) {
-	ret := _m.Called(post)
+// Save provides a mock function with given fields: rctx, post
+func (_m *PostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
+	ret := _m.Called(rctx, post)
 
 	var r0 *model.Post
 	var r1 error
-	if rf, ok := ret.Get(0).(func(*model.Post) (*model.Post, error)); ok {
-		return rf(post)
+	if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) (*model.Post, error)); ok {
+		return rf(rctx, post)
 	}
-	if rf, ok := ret.Get(0).(func(*model.Post) *model.Post); ok {
-		r0 = rf(post)
+	if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) *model.Post); ok {
+		r0 = rf(rctx, post)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*model.Post)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(*model.Post) error); ok {
-		r1 = rf(post)
+	if rf, ok := ret.Get(1).(func(request.CTX, *model.Post) error); ok {
+		r1 = rf(rctx, post)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/server/channels/store/storetest/post_acknowledgements_store.go b/server/channels/store/storetest/post_acknowledgements_store.go
index 3fccbf7a33..d2292dc5ce 100644
--- a/server/channels/store/storetest/post_acknowledgements_store.go
+++ b/server/channels/store/storetest/post_acknowledgements_store.go
@@ -33,7 +33,7 @@ func testPostAcknowledgementsStoreSave(t *testing.T, rctx request.CTX, ss store.
 			PersistentNotifications: model.NewBool(false),
 		},
 	}
-	post, err := ss.Post().Save(&p1)
+	post, err := ss.Post().Save(rctx, &p1)
 	require.NoError(t, err)
 
 	t.Run("consecutive saves should just update the acknowledged at", func(t *testing.T) {
@@ -78,7 +78,7 @@ func testPostAcknowledgementsStoreGetForPost(t *testing.T, rctx request.CTX, ss
 			PersistentNotifications: model.NewBool(false),
 		},
 	}
-	_, err := ss.Post().Save(&p1)
+	_, err := ss.Post().Save(rctx, &p1)
 	require.NoError(t, err)
 
 	t.Run("get acknowledgements for post", func(t *testing.T) {
diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go
index b886e82cee..287aa11859 100644
--- a/server/channels/store/storetest/post_store.go
+++ b/server/channels/store/storetest/post_store.go
@@ -74,7 +74,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		o1.UserId = model.NewId()
 		o1.Message = NewTestId()
 
-		p, err := ss.Post().Save(&o1)
+		p, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err, "couldn't save item")
 		assert.Equal(t, int64(0), p.ReplyCount)
 	})
@@ -123,15 +123,15 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		o3.RootId = model.NewId()
 		o3.Message = NewTestId()
 
-		p1, err := ss.Post().Save(&o1)
+		p1, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err, "couldn't save item")
 		assert.Equal(t, int64(1), p1.ReplyCount)
 
-		p2, err := ss.Post().Save(&o2)
+		p2, err := ss.Post().Save(rctx, &o2)
 		require.NoError(t, err, "couldn't save item")
 		assert.Equal(t, int64(2), p2.ReplyCount)
 
-		p3, err := ss.Post().Save(&o3)
+		p3, err := ss.Post().Save(rctx, &o3)
 		require.NoError(t, err, "couldn't save item")
 		assert.Equal(t, int64(1), p3.ReplyCount)
 	})
@@ -142,10 +142,10 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		o1.UserId = model.NewId()
 		o1.Message = NewTestId()
 
-		_, err := ss.Post().Save(&o1)
+		_, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err, "couldn't save item")
 
-		_, err = ss.Post().Save(&o1)
+		_, err = ss.Post().Save(rctx, &o1)
 		require.Error(t, err, "shouldn't be able to update from save")
 	})
 
@@ -164,7 +164,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		rootPost.UserId = model.NewId()
 		rootPost.Message = NewTestId()
 
-		_, err = ss.Post().Save(&rootPost)
+		_, err = ss.Post().Save(rctx, &rootPost)
 		require.NoError(t, err)
 
 		time.Sleep(2 * time.Millisecond)
@@ -177,7 +177,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		// We need to sleep here to be sure the post is not created during the same millisecond
 		time.Sleep(time.Millisecond)
-		_, err = ss.Post().Save(&replyPost)
+		_, err = ss.Post().Save(rctx, &replyPost)
 		require.NoError(t, err)
 
 		rrootPost, err := ss.Post().GetSingle(rootPost.Id, false)
@@ -201,7 +201,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		// We need to sleep here to be sure the post is not created during the same millisecond
 		time.Sleep(time.Millisecond)
-		_, err = ss.Post().Save(&post)
+		_, err = ss.Post().Save(rctx, &post)
 		require.NoError(t, err)
 
 		rchannel, err := ss.Channel().Get(channel.Id, false)
@@ -217,7 +217,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		// We need to sleep here to be sure the post is not created during the same millisecond
 		time.Sleep(time.Millisecond)
-		_, err = ss.Post().Save(&post)
+		_, err = ss.Post().Save(rctx, &post)
 		require.NoError(t, err)
 
 		rchannel2, err := ss.Channel().Get(channel.Id, false)
@@ -232,7 +232,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 		// We need to sleep here to be sure the post is not created during the same millisecond
 		time.Sleep(time.Millisecond)
-		_, err = ss.Post().Save(&post)
+		_, err = ss.Post().Save(rctx, &post)
 		require.NoError(t, err)
 
 		rchannel3, err := ss.Channel().Get(channel.Id, false)
@@ -255,7 +255,7 @@ func testPostStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
 			},
 		}
 
-		p, err := ss.Post().Save(&o1)
+		p, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err, "couldn't save item")
 		assert.Equal(t, int64(0), p.ReplyCount)
 
@@ -483,7 +483,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) {
 		o1.UserId = model.NewId()
 		o1.Message = "jessica hyde" + model.NewId() + "b"
 
-		root, err := ss.Post().Save(&o1)
+		root, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err)
 
 		channel2, err := ss.Channel().Save(&model.Channel{
@@ -541,7 +541,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) {
 		o5.RootId = root.Id
 		o5.Message = "zz" + model.NewId() + "b"
 
-		_, err = ss.Post().Save(&o2)
+		_, err = ss.Post().Save(rctx, &o2)
 		require.NoError(t, err)
 		thread, errT := ss.Thread().Get(root.Id)
 		require.NoError(t, errT)
@@ -550,7 +550,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) {
 		assert.Equal(t, int(1), len(thread.Participants))
 		assert.Equal(t, model.StringArray{o2.UserId}, thread.Participants)
 
-		_, err = ss.Post().Save(&o3)
+		_, err = ss.Post().Save(rctx, &o3)
 		require.NoError(t, err)
 		thread, errT = ss.Thread().Get(root.Id)
 		require.NoError(t, errT)
@@ -559,7 +559,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) {
 		assert.Equal(t, int(2), len(thread.Participants))
 		assert.Equal(t, model.StringArray{o2.UserId, o3.UserId}, thread.Participants)
 
-		_, err = ss.Post().Save(&o4)
+		_, err = ss.Post().Save(rctx, &o4)
 		require.NoError(t, err)
 		thread, errT = ss.Thread().Get(root.Id)
 		require.NoError(t, errT)
@@ -568,7 +568,7 @@ func testPostStoreSaveMultiple(t *testing.T, rctx request.CTX, ss store.Store) {
 		assert.Equal(t, int(2), len(thread.Participants))
 		assert.Equal(t, model.StringArray{o3.UserId, o2.UserId}, thread.Participants)
 
-		_, err = ss.Post().Save(&o5)
+		_, err = ss.Post().Save(rctx, &o5)
 		require.NoError(t, err)
 		thread, errT = ss.Thread().Get(root.Id)
 		require.NoError(t, errT)
@@ -589,7 +589,7 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, rctx request.CTX, ss store.
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
 
-	_, err = ss.Post().Save(&o1)
+	_, err = ss.Post().Save(rctx, &o1)
 	require.NoError(t, err)
 
 	c1, err = ss.Channel().Get(c1.Id, false)
@@ -598,12 +598,12 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, rctx request.CTX, ss store.
 
 	o1.Id = ""
 	o1.Type = model.PostTypeAddToTeam
-	_, err = ss.Post().Save(&o1)
+	_, err = ss.Post().Save(rctx, &o1)
 	require.NoError(t, err)
 
 	o1.Id = ""
 	o1.Type = model.PostTypeRemoveFromTeam
-	_, err = ss.Post().Save(&o1)
+	_, err = ss.Post().Save(rctx, &o1)
 	require.NoError(t, err)
 
 	c1, err = ss.Channel().Get(c1.Id, false)
@@ -617,7 +617,7 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, rctx request.CTX, ss store.
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.CreateAt = int64(7)
-	_, err = ss.Post().Save(&o2)
+	_, err = ss.Post().Save(rctx, &o2)
 	require.NoError(t, err)
 
 	c1, err = ss.Channel().Get(c1.Id, false)
@@ -642,7 +642,7 @@ func testPostStoreGet(t *testing.T, rctx request.CTX, ss store.Store) {
 	etag1 := ss.Post().GetEtag(o1.ChannelId, false, false)
 	require.Equal(t, 0, strings.Index(etag1, model.CurrentVersion+"."), "Invalid Etag")
 
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	etag2 := ss.Post().GetEtag(o1.ChannelId, false, false)
@@ -671,9 +671,9 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		o1 := &model.Post{ChannelId: channel.Id, UserId: model.NewId(), Message: NewTestId()}
-		o1, err = ss.Post().Save(o1)
+		o1, err = ss.Post().Save(rctx, o1)
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
 
 		_, err = ss.Thread().MaintainMembership(o1.UserId, o1.Id, store.ThreadMembershipOpts{
@@ -701,9 +701,9 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		o1 := &model.Post{ChannelId: channel.Id, UserId: model.NewId(), Message: NewTestId()}
-		o1, err = ss.Post().Save(o1)
+		o1, err = ss.Post().Save(rctx, o1)
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
 
 		_, err = ss.Thread().MaintainMembership(o1.UserId, o1.Id, store.ThreadMembershipOpts{
@@ -731,9 +731,9 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		o1 := &model.Post{ChannelId: channel.Id, UserId: model.NewId(), Message: NewTestId()}
-		o1, err = ss.Post().Save(o1)
+		o1, err = ss.Post().Save(rctx, o1)
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
 
 		opts := model.GetPostsOptions{
@@ -756,15 +756,15 @@ func testPostStoreGetForThread(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		now := model.GetMillis()
-		o1, err := ss.Post().Save(&model.Post{CreateAt: now, ChannelId: channel.Id, UserId: model.NewId(), Message: NewTestId()})
+		o1, err := ss.Post().Save(rctx, &model.Post{CreateAt: now, ChannelId: channel.Id, UserId: model.NewId(), Message: NewTestId()})
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{CreateAt: now + 1, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{CreateAt: now + 1, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
-		m1, err := ss.Post().Save(&model.Post{CreateAt: now + 2, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		m1, err := ss.Post().Save(rctx, &model.Post{CreateAt: now + 2, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{CreateAt: now + 3, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{CreateAt: now + 3, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
-		_, err = ss.Post().Save(&model.Post{CreateAt: now + 4, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
+		_, err = ss.Post().Save(rctx, &model.Post{CreateAt: now + 4, ChannelId: o1.ChannelId, UserId: model.NewId(), Message: NewTestId(), RootId: o1.Id})
 		require.NoError(t, err)
 
 		opts := model.GetPostsOptions{
@@ -917,10 +917,10 @@ func testPostStoreGetSingle(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.UserId = o1.UserId
 	o2.Message = NewTestId()
 
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
@@ -935,10 +935,10 @@ func testPostStoreGetSingle(t *testing.T, rctx request.CTX, ss store.Store) {
 	o4.Message = model.NewRandomString(10)
 	o4.RootId = o1.Id
 
-	_, err = ss.Post().Save(o3)
+	_, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 
 	err = ss.Post().Delete(rctx, o2.Id, model.GetMillis(), o2.UserId)
@@ -979,7 +979,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1.ChannelId = channel.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -987,14 +987,14 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	r1, err := ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1053,7 +1053,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	o4, err := ss.Post().Save(&model.Post{
+	o4, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    model.NewId(),
 		Message:   model.NewId(),
@@ -1091,7 +1091,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create a post
-		rootPost, err := ss.Post().Save(&model.Post{
+		rootPost, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   model.NewRandomString(10),
@@ -1140,7 +1140,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create a root post
-		rootPost, err := ss.Post().Save(&model.Post{
+		rootPost, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1148,7 +1148,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post
-		replyPost, err := ss.Post().Save(&model.Post{
+		replyPost, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1182,7 +1182,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create a root post
-		rootPost1, err := ss.Post().Save(&model.Post{
+		rootPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1190,7 +1190,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post
-		replyPost1, err := ss.Post().Save(&model.Post{
+		replyPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1199,7 +1199,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post a second time
-		replyPost2, err := ss.Post().Save(&model.Post{
+		replyPost2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1216,7 +1216,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create another root post in a separate channel
-		rootPost2, err := ss.Post().Save(&model.Post{
+		rootPost2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel2.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1253,7 +1253,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create a root post
-		rootPost1, err := ss.Post().Save(&model.Post{
+		rootPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1261,7 +1261,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post
-		replyPost1, err := ss.Post().Save(&model.Post{
+		replyPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1270,7 +1270,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post a second time
-		replyPost2, err := ss.Post().Save(&model.Post{
+		replyPost2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1279,7 +1279,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to that root post a third time
-		replyPost3, err := ss.Post().Save(&model.Post{
+		replyPost3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1330,7 +1330,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create a root post
-		rootPost1, err := ss.Post().Save(&model.Post{
+		rootPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1338,7 +1338,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Create another root post
-		rootPost2, err := ss.Post().Save(&model.Post{
+		rootPost2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1346,7 +1346,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to first root post with file attachments
-		replyPost1, err := ss.Post().Save(&model.Post{
+		replyPost1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost1.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1369,7 +1369,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 
 		// Reply to second root post with file attachments
-		replyPost2, err := ss.Post().Save(&model.Post{
+		replyPost2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: rootPost2.ChannelId,
 			UserId:    model.NewId(),
 			Message:   NewTestId(),
@@ -1416,7 +1416,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
 	o1.ChannelId = channel.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -1424,7 +1424,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	r1 := &model.Reaction{}
@@ -1462,7 +1462,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
 	o3.ChannelId = channel2.Id
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	r4 := &model.Reaction{}
@@ -1486,14 +1486,14 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
 	o4.RootId = o1.Id
 	o4.UserId = o2.UserId
 	o4.Message = NewTestId()
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 
 	o5 := &model.Post{}
 	o5.ChannelId = o3.ChannelId
 	o5.UserId = model.NewId()
 	o5.Message = NewTestId()
-	o5, err = ss.Post().Save(o5)
+	o5, err = ss.Post().Save(rctx, o5)
 	require.NoError(t, err)
 
 	o6 := &model.Post{}
@@ -1501,7 +1501,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
 	o6.RootId = o5.Id
 	o6.UserId = model.NewId()
 	o6.Message = NewTestId()
-	o6, err = ss.Post().Save(o6)
+	o6, err = ss.Post().Save(rctx, o6)
 	require.NoError(t, err)
 
 	var thread *model.Thread
@@ -1587,7 +1587,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -1595,7 +1595,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	channel2, err := ss.Channel().Save(&model.Channel{
@@ -1610,7 +1610,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto
 	o3.ChannelId = channel2.Id
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	err2 := ss.Post().PermanentDeleteByUser(rctx, o1.UserId)
@@ -1640,7 +1640,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -1648,7 +1648,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
@@ -1656,7 +1656,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.RootId = o1.Id
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	pl, err := ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1695,7 +1695,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1704,7 +1704,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	_, err = ss.Post().Save(o2)
+	_, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1713,7 +1713,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o2a.UserId = model.NewId()
 	o2a.Message = NewTestId()
 	o2a.RootId = o1.Id
-	o2a, err = ss.Post().Save(o2a)
+	o2a, err = ss.Post().Save(rctx, o2a)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1722,7 +1722,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.RootId = o1.Id
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1730,7 +1730,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o4.ChannelId = o1.ChannelId
 	o4.UserId = model.NewId()
 	o4.Message = NewTestId()
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1739,7 +1739,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o5.UserId = model.NewId()
 	o5.Message = NewTestId()
 	o5.RootId = o4.Id
-	o5, err = ss.Post().Save(o5)
+	o5, err = ss.Post().Save(rctx, o5)
 	require.NoError(t, err)
 
 	r1, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 4}, false, map[string]bool{})
@@ -1776,7 +1776,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, rctx request.CTX, ss store.S
 	o6.ChannelId = o1.ChannelId
 	o6.UserId = model.NewId()
 	o6.Message = NewTestId()
-	_, err = ss.Post().Save(o6)
+	_, err = ss.Post().Save(rctx, o6)
 	require.NoError(t, err)
 
 	r3, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 30}, false, map[string]bool{})
@@ -1800,7 +1800,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 
 		var posts []*model.Post
 		for i := 0; i < 10; i++ {
-			post, err := ss.Post().Save(&model.Post{
+			post, err := ss.Post().Save(rctx, &model.Post{
 				ChannelId: channelId,
 				UserId:    userId,
 				Message:   "message",
@@ -1910,7 +1910,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		// post5
 		// post6 (in response to post2)
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -1919,7 +1919,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -1928,7 +1928,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post2.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post1.Id,
@@ -1938,7 +1938,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post3.ReplyCount = 1
 		time.Sleep(time.Millisecond)
 
-		post4, err := ss.Post().Save(&model.Post{
+		post4, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -1948,7 +1948,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post4.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post5, err := ss.Post().Save(&model.Post{
+		post5, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -1956,7 +1956,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post6, err := ss.Post().Save(&model.Post{
+		post6, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -2017,7 +2017,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		// post5
 		// post6 (in response to post2)
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post1",
@@ -2026,7 +2026,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post1.ReplyCount = 1
 		time.Sleep(time.Millisecond)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post2",
@@ -2035,7 +2035,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post2.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post1.Id,
@@ -2045,7 +2045,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post3.ReplyCount = 1
 		time.Sleep(time.Millisecond)
 
-		post4, err := ss.Post().Save(&model.Post{
+		post4, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -2055,7 +2055,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post4.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post5, err := ss.Post().Save(&model.Post{
+		post5, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post5",
@@ -2063,7 +2063,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post6, err := ss.Post().Save(&model.Post{
+		post6, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -2132,7 +2132,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		// post5
 		// post6 (in response to post2)
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post1",
@@ -2141,7 +2141,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post1.ReplyCount = 1
 		time.Sleep(time.Millisecond)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post2",
@@ -2150,7 +2150,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post2.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post1.Id,
@@ -2160,7 +2160,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post3.ReplyCount = 1
 		time.Sleep(time.Millisecond)
 
-		post4, err := ss.Post().Save(&model.Post{
+		post4, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -2170,7 +2170,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		post4.ReplyCount = 2
 		time.Sleep(time.Millisecond)
 
-		post5, err := ss.Post().Save(&model.Post{
+		post5, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "post5",
@@ -2178,7 +2178,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, rctx request.CTX, ss store.S
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post6, err := ss.Post().Save(&model.Post{
+		post6, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			RootId:    post2.Id,
@@ -2228,7 +2228,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		channelId := channel1.Id
 		userId := model.NewId()
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2236,7 +2236,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2244,7 +2244,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2252,7 +2252,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post4, err := ss.Post().Save(&model.Post{
+		post4, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2260,7 +2260,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post5, err := ss.Post().Save(&model.Post{
+		post5, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2269,7 +2269,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post6, err := ss.Post().Save(&model.Post{
+		post6, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2310,7 +2310,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		channelId := channel1.Id
 		userId := model.NewId()
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2340,7 +2340,7 @@ func testPostStoreGetPostsSince(t *testing.T, rctx request.CTX, ss store.Store)
 		channelId := channel1.Id
 		userId := model.NewId()
 
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -2377,7 +2377,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	channelId := channel1.Id
 	userId := model.NewId()
 
-	post1, err := ss.Post().Save(&model.Post{
+	post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2385,7 +2385,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond)
 
-	post2, err := ss.Post().Save(&model.Post{
+	post2, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2393,7 +2393,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond)
 
-	post3, err := ss.Post().Save(&model.Post{
+	post3, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2401,7 +2401,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond)
 
-	post4, err := ss.Post().Save(&model.Post{
+	post4, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2409,7 +2409,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond)
 
-	post5, err := ss.Post().Save(&model.Post{
+	post5, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2418,7 +2418,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	require.NoError(t, err)
 	time.Sleep(time.Millisecond)
 
-	post6, err := ss.Post().Save(&model.Post{
+	post6, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelId,
 		UserId:    userId,
 		Message:   "message",
@@ -2568,7 +2568,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o0.ChannelId = channelId
 	o0.UserId = model.NewId()
 	o0.Message = NewTestId()
-	_, err = ss.Post().Save(o0)
+	_, err = ss.Post().Save(rctx, o0)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2577,7 +2577,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o1.Type = model.PostTypeJoinChannel
 	o1.UserId = model.NewId()
 	o1.Message = "system_join_channel message"
-	_, err = ss.Post().Save(o1)
+	_, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2586,7 +2586,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o0a.UserId = model.NewId()
 	o0a.Message = NewTestId()
 	o0a.RootId = o1.Id
-	_, err = ss.Post().Save(o0a)
+	_, err = ss.Post().Save(rctx, o0a)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2596,7 +2596,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o0b.Message = "deleted message"
 	o0b.RootId = o1.Id
 	o0b.DeleteAt = 1
-	_, err = ss.Post().Save(o0b)
+	_, err = ss.Post().Save(rctx, o0b)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2612,7 +2612,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	otherChannelPost.ChannelId = channel2.Id
 	otherChannelPost.UserId = model.NewId()
 	otherChannelPost.Message = NewTestId()
-	_, err = ss.Post().Save(otherChannelPost)
+	_, err = ss.Post().Save(rctx, otherChannelPost)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2620,7 +2620,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o2.ChannelId = channelId
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	_, err = ss.Post().Save(o2)
+	_, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -2629,7 +2629,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, rctx request.CTX, ss store.St
 	o2a.UserId = model.NewId()
 	o2a.Message = NewTestId()
 	o2a.RootId = o2.Id
-	_, err = ss.Post().Save(o2a)
+	_, err = ss.Post().Save(rctx, o2a)
 	require.NoError(t, err)
 
 	rPostId1, err := ss.Post().GetPostIdBeforeTime(channelId, o0a.CreateAt, false)
@@ -2691,7 +2691,7 @@ func testUserCountsWithPostsByDay(t *testing.T, rctx request.CTX, ss store.Store
 	o1.UserId = model.NewId()
 	o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
 	o1.Message = NewTestId()
-	o1, nErr = ss.Post().Save(o1)
+	o1, nErr = ss.Post().Save(rctx, o1)
 	require.NoError(t, nErr)
 
 	o1a := &model.Post{}
@@ -2699,7 +2699,7 @@ func testUserCountsWithPostsByDay(t *testing.T, rctx request.CTX, ss store.Store
 	o1a.UserId = model.NewId()
 	o1a.CreateAt = o1.CreateAt
 	o1a.Message = NewTestId()
-	_, nErr = ss.Post().Save(o1a)
+	_, nErr = ss.Post().Save(rctx, o1a)
 	require.NoError(t, nErr)
 
 	o2 := &model.Post{}
@@ -2707,7 +2707,7 @@ func testUserCountsWithPostsByDay(t *testing.T, rctx request.CTX, ss store.Store
 	o2.UserId = model.NewId()
 	o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
 	o2.Message = NewTestId()
-	o2, nErr = ss.Post().Save(o2)
+	o2, nErr = ss.Post().Save(rctx, o2)
 	require.NoError(t, nErr)
 
 	o2a := &model.Post{}
@@ -2715,7 +2715,7 @@ func testUserCountsWithPostsByDay(t *testing.T, rctx request.CTX, ss store.Store
 	o2a.UserId = o2.UserId
 	o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
 	o2a.Message = NewTestId()
-	_, nErr = ss.Post().Save(o2a)
+	_, nErr = ss.Post().Save(rctx, o2a)
 	require.NoError(t, nErr)
 
 	r1, err := ss.Post().AnalyticsUserCountsWithPostsByDay(t1.Id)
@@ -2751,7 +2751,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
 	o1.Message = NewTestId()
 	o1.Hashtags = "hashtag"
-	o1, nErr = ss.Post().Save(o1)
+	o1, nErr = ss.Post().Save(rctx, o1)
 	require.NoError(t, nErr)
 
 	o1a := &model.Post{}
@@ -2760,7 +2760,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1a.CreateAt = o1.CreateAt
 	o1a.Message = NewTestId()
 	o1a.FileIds = []string{"fileId1"}
-	_, nErr = ss.Post().Save(o1a)
+	_, nErr = ss.Post().Save(rctx, o1a)
 	require.NoError(t, nErr)
 
 	o2 := &model.Post{}
@@ -2769,7 +2769,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24 * 2)
 	o2.Message = NewTestId()
 	o2.Filenames = []string{"filename1"}
-	o2, nErr = ss.Post().Save(o2)
+	o2, nErr = ss.Post().Save(rctx, o2)
 	require.NoError(t, nErr)
 
 	o2a := &model.Post{}
@@ -2779,7 +2779,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2a.Message = NewTestId()
 	o2a.Hashtags = "hashtag"
 	o2a.FileIds = []string{"fileId2"}
-	_, nErr = ss.Post().Save(o2a)
+	_, nErr = ss.Post().Save(rctx, o2a)
 	require.NoError(t, nErr)
 
 	bot1 := &model.Bot{
@@ -2796,7 +2796,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	b1.ChannelId = c1.Id
 	b1.UserId = bot1.UserId
 	b1.CreateAt = utils.MillisFromTime(utils.Yesterday())
-	_, nErr = ss.Post().Save(b1)
+	_, nErr = ss.Post().Save(rctx, b1)
 	require.NoError(t, nErr)
 
 	b1a := &model.Post{}
@@ -2804,7 +2804,7 @@ func testPostCountsByDay(t *testing.T, rctx request.CTX, ss store.Store) {
 	b1a.ChannelId = c1.Id
 	b1a.UserId = bot1.UserId
 	b1a.CreateAt = utils.MillisFromTime(utils.Yesterday()) - (1000 * 60 * 60 * 24 * 2)
-	_, nErr = ss.Post().Save(b1a)
+	_, nErr = ss.Post().Save(rctx, b1a)
 	require.NoError(t, nErr)
 
 	time.Sleep(1 * time.Second)
@@ -2870,7 +2870,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p1.Message = NewTestId()
 	p1.CreateAt = twentyMinAgo
 	p1.UpdateAt = twentyMinAgo
-	_, nErr = ss.Post().Save(p1)
+	_, nErr = ss.Post().Save(rctx, p1)
 	require.NoError(t, nErr)
 
 	p2 := &model.Post{}
@@ -2880,7 +2880,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p2.Hashtags = "hashtag"
 	p2.CreateAt = twentyMinAgo
 	p2.UpdateAt = twentyMinAgo
-	p2, nErr = ss.Post().Save(p2)
+	p2, nErr = ss.Post().Save(rctx, p2)
 	require.NoError(t, nErr)
 
 	p3 := &model.Post{}
@@ -2890,7 +2890,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p3.FileIds = []string{"fileId1"}
 	p3.CreateAt = twentyMinAgo
 	p3.UpdateAt = twentyMinAgo
-	_, nErr = ss.Post().Save(p3)
+	_, nErr = ss.Post().Save(rctx, p3)
 	require.NoError(t, nErr)
 
 	p4 := &model.Post{}
@@ -2900,7 +2900,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p4.Filenames = []string{"filename1"}
 	p4.CreateAt = tenMinAgo
 	p4.UpdateAt = tenMinAgo
-	p4, nErr = ss.Post().Save(p4)
+	p4, nErr = ss.Post().Save(rctx, p4)
 	require.NoError(t, nErr)
 
 	p5 := &model.Post{}
@@ -2911,7 +2911,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p5.FileIds = []string{"fileId2"}
 	p5.CreateAt = tenMinAgo
 	p5.UpdateAt = tenMinAgo
-	_, nErr = ss.Post().Save(p5)
+	_, nErr = ss.Post().Save(rctx, p5)
 	require.NoError(t, nErr)
 
 	bot1 := &model.Bot{
@@ -2929,7 +2929,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p6.UserId = bot1.UserId
 	p6.CreateAt = twentyMinAgo
 	p6.UpdateAt = twentyMinAgo
-	_, nErr = ss.Post().Save(p6)
+	_, nErr = ss.Post().Save(rctx, p6)
 	require.NoError(t, nErr)
 
 	p7 := &model.Post{}
@@ -2938,7 +2938,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
 	p7.UserId = bot1.UserId
 	p7.CreateAt = tenMinAgo
 	p7.UpdateAt = tenMinAgo
-	_, nErr = ss.Post().Save(p7)
+	_, nErr = ss.Post().Save(rctx, p7)
 	require.NoError(t, nErr)
 
 	// total across all teams
@@ -3016,7 +3016,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3024,7 +3024,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3033,7 +3033,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.DeleteAt = 1
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3057,7 +3057,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o4.ChannelId = channel2.Id
 	o4.UserId = model.NewId()
 	o4.Message = NewTestId()
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3083,7 +3083,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o5.ChannelId = c2.Id
 	o5.UserId = m2.UserId
 	o5.Message = NewTestId()
-	o5, err = ss.Post().Save(o5)
+	o5, err = ss.Post().Save(rctx, o5)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3100,7 +3100,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
 	o6.ChannelId = channel3.Id
 	o6.UserId = m2.UserId
 	o6.Message = NewTestId()
-	o6, err = ss.Post().Save(o6)
+	o6, err = ss.Post().Save(rctx, o6)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3235,7 +3235,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3243,7 +3243,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3252,7 +3252,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.DeleteAt = 1
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3270,7 +3270,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, rctx request.CTX, ss store.Store
 	o4.ChannelId = channel2.Id
 	o4.UserId = model.NewId()
 	o4.Message = NewTestId()
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3383,7 +3383,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3391,7 +3391,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3410,7 +3410,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s
 	o3.UserId = o1.ChannelId
 	o3.Message = NewTestId()
 	o3.DeleteAt = 1
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3418,7 +3418,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s
 	o4.ChannelId = c2.Id
 	o4.UserId = model.NewId()
 	o4.Message = NewTestId()
-	o4, err = ss.Post().Save(o4)
+	o4, err = ss.Post().Save(rctx, o4)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3435,7 +3435,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, rctx request.CTX, ss s
 	o5.ChannelId = channel4.Id
 	o5.UserId = model.NewId()
 	o5.Message = NewTestId()
-	o5, err = ss.Post().Save(o5)
+	o5, err = ss.Post().Save(rctx, o5)
 	require.NoError(t, err)
 	time.Sleep(2 * time.Millisecond)
 
@@ -3529,7 +3529,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto
 	o0.UserId = model.NewId()
 	o0.Message = NewTestId()
 	o0.CreateAt = createTime
-	o0, err = ss.Post().Save(o0)
+	o0, err = ss.Post().Save(rctx, o0)
 	require.NoError(t, err)
 
 	o1 := &model.Post{}
@@ -3537,7 +3537,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
 	o1.CreateAt = createTime
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -3546,7 +3546,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
 	o2.CreateAt = createTime + 1
-	_, err = ss.Post().Save(o2)
+	_, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	channel2, err := ss.Channel().Save(&model.Channel{
@@ -3562,7 +3562,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, rctx request.CTX, ss store.Sto
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.CreateAt = createTime
-	_, err = ss.Post().Save(o3)
+	_, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	r1, _ := ss.Post().GetPostsCreatedAt(o1.ChannelId, createTime)
@@ -3583,7 +3583,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -3591,14 +3591,14 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	channel2, err := ss.Channel().Save(&model.Channel{
@@ -3609,7 +3609,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto
 	}, -1)
 	require.NoError(t, err)
 
-	o4, err := ss.Post().Save(&model.Post{
+	o4, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    model.NewId(),
 		Message:   model.NewId(),
@@ -3624,7 +3624,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, rctx request.CTX, ss store.Sto
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	o5, err := ss.Post().Save(&model.Post{
+	o5, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel3.Id,
 		UserId:    model.NewId(),
 		Message:   model.NewId(),
@@ -3733,7 +3733,7 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -3741,14 +3741,14 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.RootId = o1.Id
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	channel2, err := ss.Channel().Save(&model.Channel{
@@ -3758,7 +3758,7 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) {
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	o4, err := ss.Post().Save(&model.Post{
+	o4, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    model.NewId(),
 		Message:   model.NewId(),
@@ -3850,21 +3850,21 @@ func testPostStoreGetPostsByIds(t *testing.T, rctx request.CTX, ss store.Store)
 	o1.ChannelId = channel1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	r1, err := ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -3916,14 +3916,14 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, rctx request.CTX, ss st
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
-	o1, err := ss.Post().Save(o1)
+	o1, err := ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
 	o2.ChannelId = c2.Id
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
-	_, err = ss.Post().Save(o2)
+	_, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
@@ -3931,7 +3931,7 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, rctx request.CTX, ss st
 	o3.UserId = model.NewId()
 	o3.RootId = o1.Id
 	o3.Message = NewTestId()
-	_, err = ss.Post().Save(o3)
+	_, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	// Getting all
@@ -3978,7 +3978,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
 	o1.CreateAt = 1000
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -3986,7 +3986,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.CreateAt = 1000
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	o3 := &model.Post{}
@@ -3994,7 +3994,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 	o3.UserId = model.NewId()
 	o3.Message = NewTestId()
 	o3.CreateAt = 100000
-	o3, err = ss.Post().Save(o3)
+	o3, err = ss.Post().Save(rctx, o3)
 	require.NoError(t, err)
 
 	deleted, _, err := ss.Post().PermanentDeleteBatchForRetentionPolicies(0, 2000, 1000, model.RetentionPolicyCursor{})
@@ -4020,7 +4020,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 
 	t.Run("with pagination", func(t *testing.T) {
 		for i := 0; i < 3; i++ {
-			_, err = ss.Post().Save(&model.Post{
+			_, err = ss.Post().Save(rctx, &model.Post{
 				ChannelId: channel.Id,
 				UserId:    model.NewId(),
 				Message:   "message",
@@ -4072,7 +4072,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 			Message:   "message",
 			CreateAt:  1,
 		}
-		post, err2 = ss.Post().Save(post)
+		post, err2 = ss.Post().Save(rctx, post)
 		require.NoError(t, err2)
 
 		_, _, err2 = ss.Post().PermanentDeleteBatchForRetentionPolicies(0, 2000, 1000, model.RetentionPolicyCursor{})
@@ -4096,7 +4096,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 		})
 		require.NoError(t, err2)
 		post.Id = ""
-		post, err2 = ss.Post().Save(post)
+		post, err2 = ss.Post().Save(rctx, post)
 		require.NoError(t, err2)
 
 		nowMillis = post.CreateAt + *teamPolicy.PostDurationDays*model.DayInMilliseconds + 1
@@ -4167,7 +4167,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 		defer ss.RetentionPolicy().Delete(teamPolicy.ID)
 
 		// This one should be deleted by the channel policy
-		_, err2 = ss.Post().Save(&model.Post{
+		_, err2 = ss.Post().Save(rctx, &model.Post{
 			ChannelId: c1.Id,
 			UserId:    model.NewId(),
 			Message:   "message",
@@ -4175,7 +4175,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 		})
 		require.NoError(t, err2)
 		// This one, by the team policy
-		_, err2 = ss.Post().Save(&model.Post{
+		_, err2 = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel.Id,
 			UserId:    model.NewId(),
 			Message:   "message",
@@ -4183,7 +4183,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.
 		})
 		require.NoError(t, err2)
 		// This one, by the global policy
-		_, err2 = ss.Post().Save(&model.Post{
+		_, err2 = ss.Post().Save(rctx, &model.Post{
 			ChannelId: c2.Id,
 			UserId:    model.NewId(),
 			Message:   "message",
@@ -4224,7 +4224,7 @@ func testPostStoreGetOldest(t *testing.T, rctx request.CTX, ss store.Store) {
 	o0.UserId = model.NewId()
 	o0.Message = NewTestId()
 	o0.CreateAt = 3
-	o0, err = ss.Post().Save(o0)
+	o0, err = ss.Post().Save(rctx, o0)
 	require.NoError(t, err)
 
 	o1 := &model.Post{}
@@ -4232,7 +4232,7 @@ func testPostStoreGetOldest(t *testing.T, rctx request.CTX, ss store.Store) {
 	o1.UserId = model.NewId()
 	o1.Message = NewTestId()
 	o1.CreateAt = 2
-	o1, err = ss.Post().Save(o1)
+	o1, err = ss.Post().Save(rctx, o1)
 	require.NoError(t, err)
 
 	o2 := &model.Post{}
@@ -4240,7 +4240,7 @@ func testPostStoreGetOldest(t *testing.T, rctx request.CTX, ss store.Store) {
 	o2.UserId = model.NewId()
 	o2.Message = NewTestId()
 	o2.CreateAt = 1
-	o2, err = ss.Post().Save(o2)
+	o2, err = ss.Post().Save(rctx, o2)
 	require.NoError(t, err)
 
 	r1, err := ss.Post().GetOldest()
@@ -4291,7 +4291,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st
 	p1.UserId = u1.Id
 	p1.Message = NewTestId()
 	p1.CreateAt = 1000
-	p1, nErr = ss.Post().Save(p1)
+	p1, nErr = ss.Post().Save(rctx, p1)
 	require.NoError(t, nErr)
 
 	p2 := &model.Post{}
@@ -4299,7 +4299,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st
 	p2.UserId = u1.Id
 	p2.Message = NewTestId()
 	p2.CreateAt = 1000
-	p2, nErr = ss.Post().Save(p2)
+	p2, nErr = ss.Post().Save(rctx, p2)
 	require.NoError(t, nErr)
 	nErr = ss.Channel().Delete(c2.Id, model.GetMillis())
 	require.NoError(t, nErr)
@@ -4374,7 +4374,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, rctx request.CTX, ss store.S
 	p1.UserId = u1.Id
 	p1.Message = NewTestId()
 	p1.CreateAt = 1000
-	p1, nErr = ss.Post().Save(p1)
+	p1, nErr = ss.Post().Save(rctx, p1)
 	require.NoError(t, nErr)
 
 	p2 := &model.Post{}
@@ -4383,7 +4383,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, rctx request.CTX, ss store.S
 	p2.Message = NewTestId()
 	p2.CreateAt = 1001
 	p2.RootId = p1.Id
-	p2, nErr = ss.Post().Save(p2)
+	p2, nErr = ss.Post().Save(rctx, p2)
 	require.NoError(t, nErr)
 
 	r1, err := ss.Post().GetRepliesForExport(p1.Id)
@@ -4454,7 +4454,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request.
 	p1.UserId = u1.Id
 	p1.Message = NewTestId()
 	p1.CreateAt = 1000
-	p1, nErr = ss.Post().Save(p1)
+	p1, nErr = ss.Post().Save(rctx, p1)
 	require.NoError(t, nErr)
 
 	r1, nErr := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26), false)
@@ -4514,7 +4514,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r
 	p1.UserId = u1.Id
 	p1.Message = NewTestId()
 	p1.CreateAt = 1000
-	_, nErr = ss.Post().Save(p1)
+	_, nErr = ss.Post().Save(rctx, p1)
 	require.NoError(t, nErr)
 
 	r1, nErr := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26), false)
@@ -4573,7 +4573,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r
 		p1.UserId = u1.Id
 		p1.Message = NewTestId()
 		p1.CreateAt = 1000
-		p1, nErr = ss.Post().Save(p1)
+		p1, nErr = ss.Post().Save(rctx, p1)
 		require.NoError(t, nErr)
 		postIds = append(postIds, p1.Id)
 	}
@@ -4619,7 +4619,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, rctx request.CTX, ss store
 		channelId := channel1.Id
 		userId := model.NewId()
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -4629,7 +4629,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, rctx request.CTX, ss store
 		// runs in a goroutine.
 		time.Sleep(time.Millisecond)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "message",
@@ -4637,7 +4637,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, rctx request.CTX, ss store
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)
 
-		post3, err := ss.Post().Save(&model.Post{
+		post3, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "auto response message",
@@ -4683,7 +4683,7 @@ func testGetPostsSinceUpdateForSync(t *testing.T, rctx request.CTX, ss store.Sto
 		if p.RemoteId == nil {
 			p.RemoteId = model.NewString(model.NewId())
 		}
-		_, err := ss.Post().Save(p)
+		_, err := ss.Post().Save(rctx, p)
 		require.NoError(t, err, "couldn't save post")
 	}
 
@@ -4786,7 +4786,7 @@ func testGetPostsSinceCreateForSync(t *testing.T, rctx request.CTX, ss store.Sto
 		if p.RemoteId == nil {
 			p.RemoteId = model.NewString(model.NewId())
 		}
-		_, err := ss.Post().Save(p)
+		_, err := ss.Post().Save(rctx, p)
 		require.NoError(t, err, "couldn't save post")
 	}
 
@@ -4879,7 +4879,7 @@ func testSetPostReminder(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt
 		Message:   "hi there",
 		Type:      model.PostTypeDefault,
 	}
-	p1, err := ss.Post().Save(p1)
+	p1, err := ss.Post().Save(rctx, p1)
 	require.NoError(t, err)
 
 	reminder := &model.PostReminder{
@@ -4922,7 +4922,7 @@ func testGetPostReminders(t *testing.T, rctx request.CTX, ss store.Store, s SqlS
 			Message:   "hi there",
 			Type:      model.PostTypeDefault,
 		}
-		p1, err := ss.Post().Save(p1)
+		p1, err := ss.Post().Save(rctx, p1)
 		require.NoError(t, err)
 
 		reminder := &model.PostReminder{
@@ -4991,7 +4991,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store,
 		Message:   "hi there",
 		Type:      model.PostTypeDefault,
 	}
-	p1, err = ss.Post().Save(p1)
+	p1, err = ss.Post().Save(rctx, p1)
 	require.NoError(t, err)
 
 	p2 := &model.Post{
@@ -5000,7 +5000,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store,
 		Message:   "hi there 2",
 		Type:      model.PostTypeDefault,
 	}
-	p2, err = ss.Post().Save(p2)
+	p2, err = ss.Post().Save(rctx, p2)
 	require.NoError(t, err)
 
 	meta, err := ss.Post().GetPostReminderMetadata(p1.Id)
@@ -5043,7 +5043,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	p1.UserId = model.NewId()
 	p1.Message = "test"
 	p1.CreateAt = now
-	p1, err = ss.Post().Save(p1)
+	p1, err = ss.Post().Save(rctx, p1)
 	require.NoError(t, err)
 
 	p2 := &model.Post{}
@@ -5052,7 +5052,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	p2.Message = p1.Message
 	now = now + diff
 	p2.CreateAt = now
-	p2, err = ss.Post().Save(p2)
+	p2, err = ss.Post().Save(rctx, p2)
 	require.NoError(t, err)
 
 	bot1 := &model.Bot{
@@ -5070,7 +5070,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	b1.UserId = bot1.UserId
 	now = now + diff
 	b1.CreateAt = now
-	_, err = ss.Post().Save(b1)
+	_, err = ss.Post().Save(rctx, b1)
 	require.NoError(t, err)
 
 	p3 := &model.Post{}
@@ -5079,7 +5079,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	p3.Message = p1.Message
 	now = now + diff
 	p3.CreateAt = now
-	p3, err = ss.Post().Save(p3)
+	p3, err = ss.Post().Save(rctx, p3)
 	require.NoError(t, err)
 
 	s1 := &model.Post{}
@@ -5089,7 +5089,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	s1.Message = "system_join_channel message"
 	now = now + diff
 	s1.CreateAt = now
-	_, err = ss.Post().Save(s1)
+	_, err = ss.Post().Save(rctx, s1)
 	require.NoError(t, err)
 
 	p4 := &model.Post{}
@@ -5098,7 +5098,7 @@ func testGetNthRecentPostTime(t *testing.T, rctx request.CTX, ss store.Store) {
 	p4.Message = p1.Message
 	now = now + diff
 	p4.CreateAt = now
-	p4, err = ss.Post().Save(p4)
+	p4, err = ss.Post().Save(rctx, p4)
 	require.NoError(t, err)
 
 	r, err := ss.Post().GetNthRecentPostTime(1)
@@ -5132,7 +5132,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
 			UserId:    model.NewId(),
 			Message:   "test",
 		}
-		originalPost, err := ss.Post().Save(post)
+		originalPost, err := ss.Post().Save(rctx, post)
 		require.NoError(t, err)
 		// create an edit
 		updatedPost := originalPost.Clone()
@@ -5155,7 +5155,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
 			UserId:    model.NewId(),
 			Message:   "test",
 		}
-		originalPost, err := ss.Post().Save(post)
+		originalPost, err := ss.Post().Save(rctx, post)
 		require.NoError(t, err)
 		// get edit history
 		_, err = ss.Post().GetEditHistoryForPost(originalPost.Id)
@@ -5175,7 +5175,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
 			UserId:    model.NewId(),
 			Message:   "test",
 		}
-		originalPost, err := ss.Post().Save(post)
+		originalPost, err := ss.Post().Save(rctx, post)
 		require.NoError(t, err)
 		// delete post
 		err = ss.Post().Delete(rctx, post.Id, 100, post.UserId)
@@ -5192,7 +5192,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
 			UserId:    model.NewId(),
 			Message:   "test",
 		}
-		originalPost, err := ss.Post().Save(post)
+		originalPost, err := ss.Post().Save(rctx, post)
 		require.NoError(t, err)
 		// create an edit
 		updatedPost := originalPost.Clone()
diff --git a/server/channels/store/storetest/preference_store.go b/server/channels/store/storetest/preference_store.go
index 4d391133d7..abff095610 100644
--- a/server/channels/store/storetest/preference_store.go
+++ b/server/channels/store/storetest/preference_store.go
@@ -349,14 +349,14 @@ func testPreferenceDeleteOrphanedRows(t *testing.T, rctx request.CTX, ss store.S
 	category := model.PreferenceCategoryFlaggedPost
 	userId := model.NewId()
 
-	olderPost, err := ss.Post().Save(&model.Post{
+	olderPost, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    userId,
 		Message:   "message",
 		CreateAt:  1000,
 	})
 	require.NoError(t, err)
-	newerPost, err := ss.Post().Save(&model.Post{
+	newerPost, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    userId,
 		Message:   "message",
diff --git a/server/channels/store/storetest/reaction_store.go b/server/channels/store/storetest/reaction_store.go
index 8350846ea6..6fa1d7b770 100644
--- a/server/channels/store/storetest/reaction_store.go
+++ b/server/channels/store/storetest/reaction_store.go
@@ -34,7 +34,7 @@ func TestReactionStore(t *testing.T, rctx request.CTX, ss store.Store, s SqlStor
 }
 
 func testReactionSave(t *testing.T, rctx request.CTX, ss store.Store) {
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -91,7 +91,7 @@ func testReactionSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 	// different post
 	// create post1
-	post1, err := ss.Post().Save(&model.Post{
+	post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -136,7 +136,7 @@ func testReactionSave(t *testing.T, rctx request.CTX, ss store.Store) {
 
 func testReactionDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 	t.Run("Delete", func(t *testing.T) {
-		post, err := ss.Post().Save(&model.Post{
+		post, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: model.NewId(),
 			UserId:    model.NewId(),
 		})
@@ -172,7 +172,7 @@ func testReactionDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 	})
 
 	t.Run("Undelete", func(t *testing.T) {
-		post, err := ss.Post().Save(&model.Post{
+		post, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: model.NewId(),
 			UserId:    model.NewId(),
 		})
@@ -207,12 +207,12 @@ func testReactionDelete(t *testing.T, rctx request.CTX, ss store.Store) {
 func testReactionGetForPost(t *testing.T, rctx request.CTX, ss store.Store) {
 	userId := model.NewId()
 	// create post
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
 	require.NoError(t, err)
-	post1, err := ss.Post().Save(&model.Post{
+	post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
@@ -313,11 +313,11 @@ func testReactionGetForPostSince(t *testing.T, rctx request.CTX, ss store.Store,
 	userId := model.NewId()
 
 	// create post
-	post, _ := ss.Post().Save(&model.Post{
+	post, _ := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
-	post1, _ := ss.Post().Save(&model.Post{
+	post1, _ := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
@@ -473,17 +473,17 @@ func forceNULL(reaction *model.Reaction, s SqlStore) error {
 func testReactionDeleteAllWithEmojiName(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) {
 	emojiToDelete := model.NewId()
 
-	post, err1 := ss.Post().Save(&model.Post{
+	post, err1 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err1)
-	post2, err2 := ss.Post().Save(&model.Post{
+	post2, err2 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err2)
-	post3, err3 := ss.Post().Save(&model.Post{
+	post3, err3 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -566,17 +566,17 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, rctx request.CTX, ss store
 
 func testPermanentDeleteByUser(t *testing.T, rctx request.CTX, ss store.Store) {
 	userId := model.NewId()
-	post, err1 := ss.Post().Save(&model.Post{
+	post, err1 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err1)
-	post2, err2 := ss.Post().Save(&model.Post{
+	post2, err2 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err2)
-	post3, err3 := ss.Post().Save(&model.Post{
+	post3, err3 := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -665,13 +665,13 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss st
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	olderPost, err := ss.Post().Save(&model.Post{
+	olderPost, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    model.NewId(),
 		CreateAt:  1000,
 	})
 	require.NoError(t, err)
-	newerPost, err := ss.Post().Save(&model.Post{
+	newerPost, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    model.NewId(),
 		CreateAt:  3000,
@@ -732,22 +732,22 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, rctx request.CTX, ss st
 
 func testReactionBulkGetForPosts(t *testing.T, rctx request.CTX, ss store.Store) {
 	userId := model.NewId()
-	post, _ := ss.Post().Save(&model.Post{
+	post, _ := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
 	postId := post.Id
-	post, _ = ss.Post().Save(&model.Post{
+	post, _ = ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
 	post2Id := post.Id
-	post, _ = ss.Post().Save(&model.Post{
+	post, _ = ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
 	post3Id := post.Id
-	post, _ = ss.Post().Save(&model.Post{
+	post, _ = ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    userId,
 	})
@@ -812,13 +812,13 @@ func testReactionBulkGetForPosts(t *testing.T, rctx request.CTX, ss store.Store)
 func testReactionDeadlock(t *testing.T, rctx request.CTX, ss store.Store) {
 	ss = retrylayer.New(ss)
 
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err)
 	postId := post.Id
-	post, err = ss.Post().Save(&model.Post{
+	post, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -877,7 +877,7 @@ func testReactionDeadlock(t *testing.T, rctx request.CTX, ss store.Store) {
 }
 
 func testExistsOnPost(t *testing.T, rctx request.CTX, ss store.Store) {
-	post, _ := ss.Post().Save(&model.Post{
+	post, _ := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
@@ -898,7 +898,7 @@ func testExistsOnPost(t *testing.T, rctx request.CTX, ss store.Store) {
 }
 
 func testGetUniqueCountForPost(t *testing.T, rctx request.CTX, ss store.Store) {
-	post, _ := ss.Post().Save(&model.Post{
+	post, _ := ss.Post().Save(rctx, &model.Post{
 		ChannelId: model.NewId(),
 		UserId:    model.NewId(),
 	})
diff --git a/server/channels/store/storetest/thread_store.go b/server/channels/store/storetest/thread_store.go
index 1244d87a51..c527921e52 100644
--- a/server/channels/store/storetest/thread_store.go
+++ b/server/channels/store/storetest/thread_store.go
@@ -71,7 +71,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 			}
 		}
 
-		otmp, err3 := ss.Post().Save(&o)
+		otmp, err3 := ss.Post().Save(rctx, &o)
 		require.NoError(t, err3)
 		o2 := model.Post{}
 		o2.ChannelId = c.Id
@@ -230,7 +230,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 		o1.ChannelId = channel.Id
 		o1.UserId = model.NewId()
 		o1.Message = NewTestId()
-		rootPost, err := ss.Post().Save(&o1)
+		rootPost, err := ss.Post().Save(rctx, &o1)
 		require.NoError(t, err)
 
 		o2 := model.Post{}
@@ -238,7 +238,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 		o2.ChannelId = rootPost.ChannelId
 		o2.UserId = model.NewId()
 		o2.Message = NewTestId()
-		replyPost, err := ss.Post().Save(&o2)
+		replyPost, err := ss.Post().Save(rctx, &o2)
 		require.NoError(t, err)
 
 		o3 := model.Post{}
@@ -246,7 +246,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 		o3.ChannelId = rootPost.ChannelId
 		o3.UserId = o2.UserId
 		o3.Message = NewTestId()
-		replyPost2, err := ss.Post().Save(&o3)
+		replyPost2, err := ss.Post().Save(rctx, &o3)
 		require.NoError(t, err)
 
 		o4 := model.Post{}
@@ -254,7 +254,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 		o4.ChannelId = rootPost.ChannelId
 		o4.UserId = model.NewId()
 		o4.Message = NewTestId()
-		replyPost3, err := ss.Post().Save(&o4)
+		replyPost3, err := ss.Post().Save(rctx, &o4)
 		require.NoError(t, err)
 
 		thread, err := ss.Thread().Get(rootPost.Id)
@@ -477,10 +477,9 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
 	}
 }
 
-func threadStoreCreateReply(t *testing.T, ss store.Store, channelID, postID, userID string, createAt int64) *model.Post {
+func threadStoreCreateReply(t *testing.T, rctx request.CTX, ss store.Store, channelID, postID, userID string, createAt int64) *model.Post {
 	t.Helper()
-
-	reply, err := ss.Post().Save(&model.Post{
+	reply, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channelID,
 		UserId:    userID,
 		CreateAt:  createAt,
@@ -508,12 +507,12 @@ func testThreadStorePermanentDeleteBatchForRetentionPolicies(t *testing.T, rctx
 	}, -1)
 	require.NoError(t, err)
 
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err)
-	threadStoreCreateReply(t, ss, channel.Id, post.Id, post.UserId, 2000)
+	threadStoreCreateReply(t, rctx, ss, channel.Id, post.Id, post.UserId, 2000)
 
 	thread, err := ss.Thread().Get(post.Id)
 	require.NoError(t, err)
@@ -535,7 +534,7 @@ func testThreadStorePermanentDeleteBatchForRetentionPolicies(t *testing.T, rctx
 	assert.Nil(t, thread, "thread should have been deleted by channel policy")
 
 	// create a new thread
-	threadStoreCreateReply(t, ss, channel.Id, post.Id, post.UserId, 2000)
+	threadStoreCreateReply(t, rctx, ss, channel.Id, post.Id, post.UserId, 2000)
 	thread, err = ss.Thread().Get(post.Id)
 	require.NoError(t, err)
 
@@ -596,12 +595,12 @@ func testThreadStorePermanentDeleteBatchThreadMembershipsForRetentionPolicies(t
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel.Id,
 		UserId:    model.NewId(),
 	})
 	require.NoError(t, err)
-	threadStoreCreateReply(t, ss, channel.Id, post.Id, post.UserId, 2000)
+	threadStoreCreateReply(t, rctx, ss, channel.Id, post.Id, post.UserId, 2000)
 
 	threadMembership := createThreadMembership(userID, post.Id)
 
@@ -691,13 +690,13 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) {
 		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	post, err := ss.Post().Save(&model.Post{
+	post, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel1.Id,
 		UserId:    userID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
-	threadStoreCreateReply(t, ss, channel1.Id, post.Id, post.UserId, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, channel1.Id, post.Id, post.UserId, model.GetMillis())
 	createThreadMembership(userID, post.Id)
 
 	teamsUnread, err := ss.Thread().GetTeamsUnreadForUser(userID, []string{team1.Id}, true)
@@ -705,13 +704,13 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) {
 	assert.Len(t, teamsUnread, 1)
 	assert.Equal(t, int64(1), teamsUnread[team1.Id].ThreadCount)
 
-	post, err = ss.Post().Save(&model.Post{
+	post, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel1.Id,
 		UserId:    userID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
-	threadStoreCreateReply(t, ss, channel1.Id, post.Id, post.UserId, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, channel1.Id, post.Id, post.UserId, model.GetMillis())
 	createThreadMembership(userID, post.Id)
 
 	teamsUnread, err = ss.Thread().GetTeamsUnreadForUser(userID, []string{team1.Id}, true)
@@ -734,7 +733,7 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) {
 	}, -1)
 	require.NoError(t, err)
 
-	post2, err := ss.Post().Save(&model.Post{
+	post2, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    userID,
 		Message:   model.NewRandomString(10),
@@ -747,7 +746,7 @@ func testGetTeamsUnreadForUser(t *testing.T, rctx request.CTX, ss store.Store) {
 		},
 	})
 	require.NoError(t, err)
-	threadStoreCreateReply(t, ss, channel2.Id, post2.Id, post2.UserId, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, channel2.Id, post2.Id, post2.UserId, model.GetMillis())
 	createThreadMembership(userID, post2.Id)
 
 	teamsUnread, err = ss.Thread().GetTeamsUnreadForUser(userID, []string{team1.Id, team2.Id}, true)
@@ -862,21 +861,21 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
 	}, -1)
 	require.NoError(t, err)
 
-	team1channel1post1, err := ss.Post().Save(&model.Post{
+	team1channel1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	team1channel1post2, err := ss.Post().Save(&model.Post{
+	team1channel1post2, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	team1channel1post3, err := ss.Post().Save(&model.Post{
+	team1channel1post3, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
@@ -890,28 +889,28 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
 	})
 	require.NoError(t, err)
 
-	team2channel1post1, err := ss.Post().Save(&model.Post{
+	team2channel1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	team2channel1post2deleted, err := ss.Post().Save(&model.Post{
+	team2channel1post2deleted, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	dm1post1, err := ss.Post().Save(&model.Post{
+	dm1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: dm1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	gm1post1, err := ss.Post().Save(&model.Post{
+	gm1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: gm1.Id,
 		UserId:    user1ID,
 		Message:   model.NewRandomString(10),
@@ -928,13 +927,13 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
 		gm1post1.Id:                  "gm1post1",
 	}
 
-	threadStoreCreateReply(t, ss, team1channel1.Id, team1channel1post1.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, team1channel1.Id, team1channel1post2.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, team1channel1.Id, team1channel1post3.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, team2channel1.Id, team2channel1post1.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, team2channel1.Id, team2channel1post2deleted.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, dm1.Id, dm1post1.Id, user2ID, model.GetMillis())
-	threadStoreCreateReply(t, ss, gm1.Id, gm1post1.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team1channel1.Id, team1channel1post1.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team1channel1.Id, team1channel1post2.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team1channel1.Id, team1channel1post3.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team2channel1.Id, team2channel1post1.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team2channel1.Id, team2channel1post2deleted.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, dm1.Id, dm1post1.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, gm1.Id, gm1post1.Id, user2ID, model.GetMillis())
 
 	// Create thread memberships, with simulated unread mentions.
 	createThreadMembership(user1ID, team1channel1post1.Id, false)
@@ -953,7 +952,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
 
 	// Add reply to a viewed thread to confirm it's unread again.
 	time.Sleep(2 * time.Millisecond)
-	threadStoreCreateReply(t, ss, team1channel1.Id, team1channel1post2.Id, user2ID, model.GetMillis())
+	threadStoreCreateReply(t, rctx, ss, team1channel1.Id, team1channel1post2.Id, user2ID, model.GetMillis())
 
 	// Actually make team2channel1post2deleted deleted
 	err = ss.Post().Delete(rctx, team2channel1post2deleted.Id, model.GetMillis(), user1ID)
@@ -1261,14 +1260,14 @@ func testMarkAllAsReadByChannels(t *testing.T, rctx request.CTX, ss store.Store)
 	})
 
 	t.Run("single channel", func(t *testing.T) {
-		post, err := ss.Post().Save(&model.Post{
+		post, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel1.Id,
 			UserId:    postingUserId,
 			Message:   "Root",
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel1.Id,
 			UserId:    postingUserId,
 			RootId:    post.Id,
@@ -1296,14 +1295,14 @@ func testMarkAllAsReadByChannels(t *testing.T, rctx request.CTX, ss store.Store)
 	})
 
 	t.Run("multiple channels", func(t *testing.T) {
-		post1, err := ss.Post().Save(&model.Post{
+		post1, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel1.Id,
 			UserId:    postingUserId,
 			Message:   "Root",
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel1.Id,
 			UserId:    postingUserId,
 			RootId:    post1.Id,
@@ -1311,14 +1310,14 @@ func testMarkAllAsReadByChannels(t *testing.T, rctx request.CTX, ss store.Store)
 		})
 		require.NoError(t, err)
 
-		post2, err := ss.Post().Save(&model.Post{
+		post2, err := ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel2.Id,
 			UserId:    postingUserId,
 			Message:   "Root",
 		})
 		require.NoError(t, err)
 
-		_, err = ss.Post().Save(&model.Post{
+		_, err = ss.Post().Save(rctx, &model.Post{
 			ChannelId: channel2.Id,
 			UserId:    postingUserId,
 			RootId:    post2.Id,
@@ -1423,14 +1422,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	}, -1)
 	require.NoError(t, err)
 
-	team1channel1post1, err := ss.Post().Save(&model.Post{
+	team1channel1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    postingUserId,
 		RootId:    team1channel1post1.Id,
@@ -1438,14 +1437,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	})
 	require.NoError(t, err)
 
-	team1channel2post1, err := ss.Post().Save(&model.Post{
+	team1channel2post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel2.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: team1channel1.Id,
 		UserId:    postingUserId,
 		RootId:    team1channel2post1.Id,
@@ -1453,14 +1452,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	})
 	require.NoError(t, err)
 
-	team2channel1post1, err := ss.Post().Save(&model.Post{
+	team2channel1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel1.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel1.Id,
 		UserId:    postingUserId,
 		RootId:    team2channel1post1.Id,
@@ -1468,14 +1467,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	})
 	require.NoError(t, err)
 
-	team2channel2post1, err := ss.Post().Save(&model.Post{
+	team2channel2post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel2.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: team2channel1.Id,
 		UserId:    postingUserId,
 		RootId:    team2channel2post1.Id,
@@ -1490,14 +1489,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	}, -1)
 	require.NoError(t, err)
 
-	gm1post1, err := ss.Post().Save(&model.Post{
+	gm1post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: gm1.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: gm1.Id,
 		UserId:    postingUserId,
 		RootId:    gm1post1.Id,
@@ -1512,14 +1511,14 @@ func testMarkAllAsReadByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
 	}, -1)
 	require.NoError(t, err)
 
-	gm2post1, err := ss.Post().Save(&model.Post{
+	gm2post1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: gm2.Id,
 		UserId:    postingUserId,
 		Message:   "Root",
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: gm2.Id,
 		UserId:    postingUserId,
 		RootId:    gm2post1.Id,
@@ -1620,14 +1619,14 @@ func testDeleteMembershipsForChannel(t *testing.T, rctx request.CTX, ss store.St
 	}, -1)
 	require.NoError(t, err)
 
-	rootPost1, err := ss.Post().Save(&model.Post{
+	rootPost1, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel1.Id,
 		UserId:    postingUserID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
 
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel1.Id,
 		UserId:    postingUserID,
 		Message:   model.NewRandomString(10),
@@ -1635,13 +1634,13 @@ func testDeleteMembershipsForChannel(t *testing.T, rctx request.CTX, ss store.St
 	})
 	require.NoError(t, err)
 
-	rootPost2, err := ss.Post().Save(&model.Post{
+	rootPost2, err := ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    postingUserID,
 		Message:   model.NewRandomString(10),
 	})
 	require.NoError(t, err)
-	_, err = ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(rctx, &model.Post{
 		ChannelId: channel2.Id,
 		UserId:    postingUserID,
 		Message:   model.NewRandomString(10),
diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go
index 7f90275681..846c2d1ee8 100644
--- a/server/channels/store/storetest/user_store.go
+++ b/server/channels/store/storetest/user_store.go
@@ -2468,7 +2468,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) {
 	p1.Message = "this is a message for @" + u2.Username + " and " + "@" + u3.Username
 
 	// Post one message with mention to open channel
-	_, nErr = ss.Post().Save(&p1)
+	_, nErr = ss.Post().Save(rctx, &p1)
 	require.NoError(t, nErr)
 	nErr = ss.Channel().IncrementMentionCount(c1.Id, []string{u2.Id, u3.Id}, false, false)
 	require.NoError(t, nErr)
@@ -2479,7 +2479,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) {
 	p2.UserId = u1.Id
 	p2.Message = "first message"
 
-	_, nErr = ss.Post().Save(&p2)
+	_, nErr = ss.Post().Save(rctx, &p2)
 	require.NoError(t, nErr)
 	nErr = ss.Channel().IncrementMentionCount(c2.Id, []string{u2.Id}, false, false)
 	require.NoError(t, nErr)
@@ -2488,7 +2488,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) {
 	p3.ChannelId = c2.Id
 	p3.UserId = u1.Id
 	p3.Message = "second message"
-	_, nErr = ss.Post().Save(&p3)
+	_, nErr = ss.Post().Save(rctx, &p3)
 	require.NoError(t, nErr)
 
 	nErr = ss.Channel().IncrementMentionCount(c2.Id, []string{u2.Id}, false, false)
@@ -6231,7 +6231,7 @@ func testGetUserReport(t *testing.T, rctx request.CTX, ss store.Store, s SqlStor
 	for _, user := range users {
 		for i := 0; i < numPostsPerUser; i++ {
 			post := model.Post{UserId: user.Id, ChannelId: model.NewId(), Message: NewTestId(), CreateAt: now.AddDate(0, 0, -i).UnixMilli()}
-			_, err := ss.Post().Save(&post)
+			_, err := ss.Post().Save(rctx, &post)
 			require.NoError(t, err)
 		}
 	}
diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go
index 1e06133dc0..ff86879f0d 100644
--- a/server/channels/store/timerlayer/timerlayer.go
+++ b/server/channels/store/timerlayer/timerlayer.go
@@ -6153,10 +6153,10 @@ func (s *TimerLayerPostStore) PermanentDeleteByUser(rctx request.CTX, userID str
 	return err
 }
 
-func (s *TimerLayerPostStore) Save(post *model.Post) (*model.Post, error) {
+func (s *TimerLayerPostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
 	start := time.Now()
 
-	result, err := s.PostStore.Save(post)
+	result, err := s.PostStore.Save(rctx, post)
 
 	elapsed := float64(time.Since(start)) / float64(time.Second)
 	if s.Root.Metrics != nil {
diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go
index 7d81c80c23..a15d38e7b6 100644
--- a/server/platform/services/slackimport/slackimport.go
+++ b/server/platform/services/slackimport/slackimport.go
@@ -670,7 +670,7 @@ func (si *SlackImporter) oldImportPost(rctx request.CTX, post *model.Post) strin
 
 		post.RootId = firstPostId
 
-		_, err := si.store.Post().Save(post)
+		_, err := si.store.Post().Save(rctx, post)
 		if err != nil {
 			rctx.Logger().Debug("Error saving post.", mlog.String("user_id", post.UserId), mlog.String("message", post.Message))
 		}