MSINM-47: Introduced system-wide configurable organization