Merge "Optimise UserWakeupStorePerformance" into main