Merge branch 'lobby-msgs' into develop