ebc7800307
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 800f4c8cf4eb484cafebabd1d1051a16a6df4401)