- Patch #15570 by Drumm: integrated the admin and system module. Renamed the callback as per Goba's suggestion.