dd8c6e96d7
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 6209b3550d8687aefc1cf92f3fa4e4516686228b)