Not for this pull-request, but maybe this would have been better in LMS if it can't run in CMS.