- Correctly sort and order variables - Add dependencies reported by QA script - Regenerate patch PR: 222497 Submitted by: Olivier Duchateau <duchateau.olivier@gmail.com>