This is a cherry-pick of 598f178054 Co-authored-by: Léopold Jacquot <leopold.jacquot@infomaniak.com>
598f178054