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