[MERGE] Forward-port of 12.0 into 13.0

This commit is contained in:
Antoine Vandevenne (anv) 2020-01-27 11:06:08 +01:00
commit 9e446190e4