Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit e19c37c724f5e1b06e78de459a05a34f2437fe5e)
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 364f32a14b9888f73a3a103b8b5e1bc9b31e148e)