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