Ready for CMSMS 2.2.10+ and 2.3, PHP 7.3+