Merge latest changes from default

2022-07-11, Edouard Tisserant