Merge branch 'main' into fix/450-hook-startup-latency