Merging during freeze with approval from all stakeholders, including verbal approval from @sharon-fdm Co-authored-by: Jacob Shandling <jacob@fleetdm.com>