2.4-develop
AC-16043: SRI file processing improvements.
AC-16633: SRI refactoring and bug fixes.
AC-16044: Test SRI support for custom modules.