Merge "move redundant logic to server" into devel_3.0_main