Merge pull request #2939 from fosrl/dev

1.18.1-s.2

Merge pull request #2936 from fosrl/dev

1.18.1 patch over

Merge pull request #2936 from fosrl/dev

1.18.1 patch over

Merge pull request #2933 from fosrl/dev

1.18.1

Merge pull request #2922 from fosrl/dev

1.18.0-s.2

Merge pull request #2921 from fosrl/dev

1.18.0-s.1

Merge pull request #2919 from fosrl/dev

Add missing imports

Merge pull request #2919 from fosrl/dev

Add missing imports

fix full sudo mode calculation

Sites optional