Modules - Batch Options in consistent order (Fixes #5035)
Merge remote-tracking branch 'origin/staging' into staging