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