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