Merge "Improve server flags / add more server control" into sc-dev