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