merge 3.30 into 3.31

Nicolas Chauvat requested to merge topic/3.31/merge-3.30-into-3.31 into branch/3.31 Jun 17, 2021