b383939082
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 320a75841427d30df453526ec2dc3c9853538514)