Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit f9159b651866fbe8e2a1866231b5413cecc5b597)
(cherry picked from commit 7804f19d27d65af855e145de1953df9a553f3ce0)