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