Merge "SM: Change volume mountUserId for new user" into main