Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 09cbfe5245c206670aa2191c151fd8f2ea48df3a)
(cherry picked from commit e42b61f67a8352c9d9bc30207031989785295b65)