6c6e406879
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit eb311420d9f7869af07605064a4e8d442486896a)