ff3af007e0
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit d59ed90fa89755f476150eaee7527282ef0bae7a)