[PRQ#41911] Merge Request for softmaker-office-2021 Accepted