Merge branch 'master' into patch-1

2 jobs for fix_CI_pipeline in 1 minute and 24 seconds