update codebase following by merged social stabilization branch.