Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 0b2ab3c6ff4213bccc064822e640cc40592a39e8)
(cherry picked from commit cb1f15dcba46a15dbd5c5a8493593854855be331)