Merge branch 'main' into 1842-optimization-predelay