Merge remote-tracking branch 'remotes/forge/500-head-tracking-api-causes-extra-15ms-of-delay' into 5ms_api_main_merge
