Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit c8a39bb42792770c001ac90d6301d53126225d95)
(cherry picked from commit 69fa48d9138ee4c555e88e49970619dfa9c561ce)