Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 4a555a8b04d88cb5c1943229fa0c0d828a22788d)
(cherry picked from commit 807308321ffba6f3813b1e8e86bbab5b955178f5)