Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 7b0c0015a15a243b6b4aef3d78e7653d556ad109)
(cherry picked from commit 49110aa8db8b4e0707127ae39d5b2db2ecd6e339)