(cherry picked from commit 0eb80e70bb22e7b6f1bb8552aa6ecd6ca9ab304f)
Signed-off-by: dab246 <tdvu@linagora.com>