Merging to main branch all the changes in lobby
requested review from @sachink
assigned to @sachink
merged
@jmngeo Done