[SD-1119] fixing the code are merge conflict.

close #389
Merge remote-tracking branch 'upstream/feat-privilege' into feat-privilege