b0e6975012
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 436887d8a27c1d4d3b2262eea2881a81a406162d)