Merge make sysent
refactor
#2243
+3,039
−1,955
Merged
make sysent
refactor
#2243