Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 974cb71071e0cb870f0f9a74100bfa557cf3700b)
(cherry picked from commit 843c703e80559ab7d6a9fa3a4562ae85c1426a1f)