Merge branch 'nightly' into critical_nightly

4 jobs for critical_nightly in 3600 minutes and 6 seconds