Ready for CMSMS 2.2.11 and 2.3, PHP 7.3+