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