Add new methods to test sudo cases
Merge branch 'release/v2.1.30'