Merge commit '588534d022' into release/8.0.2 # Conflicts: # public/legacy/include/Services/NormalizeRecords/NormalizeRecordsSchedulerJob.php # public/legacy/modules/Administration/templates/RepairUtfEncoding.tpl # public/legacy/modules/Administration/templates/RepairUtfEncodingStatus.tpl # public/legacy/modules/Administration/templates/RepairUtfEncodingSyncStatus.tpl # public/legacy/suitecrm_version.php # public/legacy/themes/suite8/css/Dawn/style.scss # public/legacy/themes/suite8/css/suitep-base/admin-backup.scss # public/legacy/themes/suite8/css/suitep-base/editview.scss # public/legacy/themes/suite8/css/suitep-base/meetings.scss # public/legacy/themes/suite8/css/suitep-base/scheduler.scss
588534d022