Merge branch 'ns/cluster-based' into develop
Remove static function. Use unnamed namespace to wrap these function
Merge branch 'arrange'