Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 377085ba9054c6eb4c8e3d8388821473b3335962)
(cherry picked from commit 514fec1f2f4f1ff8a584bf8db7bf3a5537a3e9f8)