Merge "Make more methods in IMMS multi-user aware" into main