(cherry picked from commit e675f98a6c85d9c4a90efc686e6ff72d23b4c678)
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 1a5bad168cddf07662f4c682189840bc8c4bdcef)