Merge "move multi-user and enterprise annotations to the modules" into main