Merge branch 'main' into 2431-use-of-calloc-in-basop